Jython 2.7.1+ compatibility on Windows. Fixes robotframework#3364.

pekkaklarck · pekkaklarck · commit afe785b16633 · 2019-11-05T15:06:11.000+02:00
diff --git a/atest/robot/rebot/filter_by_names.robot b/atest/robot/rebot/filter_by_names.robot
@@ -70,7 +70,7 @@ ${INPUT FILE}     %{TEMPDIR}${/}robot-test-file.xml
     ...    --name CustomName --suite nonex    ${INPUT FILE} ${INPUT FILE}
 
 --suite and --test together
-    Run And Check Suites and Tests    --suite tsuite1 --suite tsuite3 --test *1first --test *2*    Tsuite1    Suite1 First
+    Run And Check Suites and Tests    --suite tsuite1 --suite tsuite3 --test *1first --test nomatch    Tsuite1    Suite1 First
 
 --suite and --test together not matching
     Failing Rebot
diff --git a/src/robot/utils/encoding.py b/src/robot/utils/encoding.py
@@ -86,10 +86,15 @@ def system_encode(string, errors='replace'):
 
 else:
 
+    # Jython 2.7.1+ uses UTF-8 with cli args etc. regardless the actual system
+    # encoding. Cannot set the "real" SYSTEM_ENCODING to that value because
+    # we use it also for other purposes.
+    _SYSTEM_ENCODING = SYSTEM_ENCODING if not JYTHON else 'UTF-8'
+
     def system_decode(string):
         """Decodes bytes from system (e.g. cli args or env vars) to Unicode."""
         try:
-            return string.decode(SYSTEM_ENCODING)
+            return string.decode(_SYSTEM_ENCODING)
         except UnicodeError:
             return unic(string)
 
@@ -100,4 +105,4 @@ def system_encode(string, errors='replace'):
         """
         if not is_unicode(string):
             string = unic(string)
-        return string.encode(SYSTEM_ENCODING, errors)
+        return string.encode(_SYSTEM_ENCODING, errors)
diff --git a/src/robot/utils/encodingsniffer.py b/src/robot/utils/encodingsniffer.py
@@ -53,15 +53,19 @@ def _get_encoding(platform_getters, default):
 
 
 def _get_python_system_encoding():
-    # `locale.getpreferredencoding(False)` returns exactly what we want, but
-    # it doesn't seem to work outside Windows on Python 2. Luckily on these
+    # `locale.getpreferredencoding(False)` should return exactly what we want,
+    # but it doesn't seem to work outside Windows on Python 2. Luckily on these
     # platforms `sys.getfilesystemencoding()` seems to do the right thing.
+    # Jython 2.7.1+ actually uses UTF-8 regardless the system encoding, but
+    # that's handled by `system_decode/encode` utilities separately.
     if PY2 and not WINDOWS:
         return sys.getfilesystemencoding()
     return locale.getpreferredencoding(False)
 
 
 def _get_java_system_encoding():
+    # This is only used with Jython 2.7.0, others get encoding already
+    # from `_get_python_system_encoding`.
     from java.lang import System
     return System.getProperty('file.encoding')
 
