Fix Import Library with WITH NAME containing non-ASCII spaces robotframework#3121

pekkaklarck · yanne · commit 1c4c5d66b399 · 2019-09-03T07:29:37.000+03:00
diff --git a/atest/robot/standard_libraries/builtin/import_library.robot b/atest/robot/standard_libraries/builtin/import_library.robot
@@ -14,6 +14,9 @@ Import Library With Arguments
 Import Library With Variables And WITH NAME
     Check Test Case    ${TEST NAME}
 
+Import Library With WITH NAME containing non-ASCII spaces
+    Check Test Case    ${TEST NAME}
+
 Import Library Using Physical Path
     Check Test Case    ${TEST NAME}
 
diff --git a/atest/testdata/standard_libraries/builtin/import_library.robot b/atest/testdata/standard_libraries/builtin/import_library.robot
@@ -21,6 +21,11 @@ Import Library With Variables And WITH NAME
     Import Library    ${name}    ${42}    ${name}    WITH NAME    Variables-${42}
     Variables-42.Parameters Should Be    ${42}    ParameterLibrary
 
+Import Library With WITH NAME containing non-ASCII spaces
+    ${name} =    Set Variable    ParameterLibrary
+    Import Library    ${name}    Ogham space mark    : :    WITH NAME    Ogham space mark
+    Ogham space mark.Parameters Should Be    Ogham space mark    : :
+
 Import Library Using Physical Path
     Import Library    ${CURDIR}${/}RegisteredClass.py
     RegisteredClass. Run Keyword If Method    False    Fail    This is not executed
diff --git a/src/robot/libraries/BuiltIn.py b/src/robot/libraries/BuiltIn.py
@@ -27,12 +27,13 @@
 from robot.running.context import EXECUTION_CONTEXTS
 from robot.running.usererrorhandler import UserErrorHandler
 from robot.utils import (DotDict, escape, format_assign_message,
-                         get_error_message, get_time, html_escape, is_falsy, is_integer,
-                         is_string, is_truthy, is_unicode, IRONPYTHON, JYTHON,
-                         Matcher, normalize, NormalizedDict, parse_time, prepr,
-                         plural_or_not as s, PY3, RERAISED_EXCEPTIONS, roundup,
-                         secs_to_timestr, seq2str, split_from_equals, StringIO,
-                         timestr_to_secs, type_name, unic, is_list_like)
+                         get_error_message, get_time, html_escape, is_falsy,
+                         is_integer, is_list_like, is_string, is_truthy,
+                         is_unicode, IRONPYTHON, JYTHON, Matcher, normalize,
+                         normalize_whitespace, NormalizedDict, parse_time,
+                         prepr, plural_or_not as s, PY3, RERAISED_EXCEPTIONS,
+                         roundup, secs_to_timestr, seq2str, split_from_equals,
+                         StringIO, timestr_to_secs, type_name, unic)
 from robot.utils.asserts import assert_equal, assert_not_equal
 from robot.variables import (is_list_var, is_var, DictVariableTableValue,
                              VariableTableValue, VariableSplitter,
@@ -2767,7 +2768,7 @@ def import_library(self, name, *args):
             raise RuntimeError(unic(err))
 
     def _split_alias(self, args):
-        if len(args) > 1 and args[-2] == 'WITH NAME':
+        if len(args) > 1 and normalize_whitespace(args[-2]) == 'WITH NAME':
             return args[:-2], args[-1]
         return args, None
 
