Use robot.utils.platform constants where applicable

pekkaklarck · pekkaklarck · commit c6a61161bacb · 2018-11-08T15:20:41.000+02:00
diff --git a/src/robot/libraries/OperatingSystem.py b/src/robot/libraries/OperatingSystem.py
@@ -1428,7 +1428,7 @@ def close(self):
         #   In Jython return code can be between '-255' - '255'
         #   In Python return code must be converted with 'rc >> 8' and it is
         #   between 0-255 after conversion
-        if os.sep == '\\' or sys.platform.startswith('java'):
+        if WINDOWS or JYTHON:
             return rc % 256
         return rc >> 8
 
diff --git a/src/robot/running/signalhandler.py b/src/robot/running/signalhandler.py
@@ -16,13 +16,15 @@
 import sys
 from threading import currentThread
 import signal
-if sys.platform.startswith('java'):
-    from java.lang import IllegalArgumentException
-else:
-    IllegalArgumentException = ValueError
 
 from robot.errors import ExecutionFailed
 from robot.output import LOGGER
+from robot.utils import JYTHON
+
+if JYTHON:
+    from java.lang import IllegalArgumentException
+else:
+    IllegalArgumentException = ValueError
 
 
 class _StopSignalMonitor(object):
@@ -40,7 +42,7 @@ def __call__(self, signum, frame):
             sys.__stderr__.write('Execution forcefully stopped.\n')
             raise SystemExit()
         sys.__stderr__.write('Second signal will force exit.\n')
-        if self._running_keyword and not sys.platform.startswith('java'):
+        if self._running_keyword and not JYTHON:
             self._stop_execution_gracefully()
 
     def _stop_execution_gracefully(self):
diff --git a/src/robot/utils/compress.py b/src/robot/utils/compress.py
@@ -14,17 +14,16 @@
 #  limitations under the License.
 
 import base64
-import sys
 
-from .platform import PY2
+from .platform import JYTHON, PY2
 
 
 def compress_text(text):
     result = base64.b64encode(_compress(text.encode('UTF-8')))
     return result if PY2 else result.decode('ASCII')
 
 
-if not sys.platform.startswith('java'):
+if not JYTHON:
 
     import zlib
 
diff --git a/utest/utils/test_compat.py b/utest/utils/test_compat.py
@@ -2,7 +2,7 @@
 import sys
 import unittest
 
-from robot.utils import isatty, PYTHON
+from robot.utils import isatty
 from robot.utils.asserts import assert_equal, assert_false, assert_raises
 
 
@@ -23,8 +23,7 @@ def test_with_detached_io_buffer(self):
         with io.StringIO() as stream:
             wrapper = io.TextIOWrapper(stream, 'UTF-8')
             wrapper.detach()
-            exc_type = ValueError if PYTHON else AttributeError
-            assert_raises(exc_type, wrapper.isatty)
+            assert_raises((ValueError, AttributeError), wrapper.isatty)
             assert_false(isatty(wrapper))
 
 
