issue #1361 no more linux2

CellProfiler · May 15, 2015 · 046b27c · 046b27c
1 parent 4051816
commit 046b27c
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/CellProfiler.py b/CellProfiler.py
@@ -319,7 +319,7 @@ def parse_args(args):
                       default=False)
 
     default_show_gui = True
-    if sys.platform == 'linux2':
+    if sys.platform.startswith('linux'):
         if not os.getenv('DISPLAY'):
             default_show_gui = False
 

diff --git a/cellprofiler/analysis.py b/cellprofiler/analysis.py
@@ -759,7 +759,7 @@ def wait(self):
                            "%s is not executable" % cp_executable
                     args = (["arch", "-x86_64", "-i386", cp_executable] + 
                             aw_args)
-                elif sys.platform == 'linux2':
+                elif sys.platform.startswith('linux'):
                     aw_path = os.path.join(os.path.dirname(__file__),
                                            "analysis_worker.py")
                     args = [sys.executable, aw_path] + aw_args

diff --git a/cellprofiler/gui/pipelinelistview.py b/cellprofiler/gui/pipelinelistview.py
@@ -242,7 +242,7 @@ def add_transparent_window_for_tooltip(self, input_list_ctrl):
         # display a tooltip over a transparent window in front of the disabled
         # window. 
         #
-        if sys.platform == 'linux2':
+        if sys.platform.startswith('linux'):
             self.transparent_window = None
             return # Doesn't work right.
         transparent_window = wx.Panel(self.__panel)

diff --git a/cellprofiler/modules/tests/test_loadimages.py b/cellprofiler/modules/tests/test_loadimages.py
@@ -1770,7 +1770,8 @@ def test_06_06_allowed_conflict(self):
                 #
                 # Also happens on at least one Centos build.
                 #
-                if os.stat_float_times() and not sys.platform in ("darwin", "linux2"):
+                if os.stat_float_times() and not any([
+                    sys.platform.startswith(x) for x in ("darwin", "linux")]):
                     time.sleep(.1)
                 else:
                     time.sleep(1)

diff --git a/cellprofiler/tests/test_nowx.py b/cellprofiler/tests/test_nowx.py
@@ -29,7 +29,7 @@ def import_all_but_wx(name,
         raise ImportError("Not allowed to import wx!")
     return default_import(name, globals, locals, fromlist, level)
 
-@unittest.skipIf(sys.platform == 'linux2', "Do not test under Linux")
+@unittest.skipIf(sys.platform.startswith('linux'), "Do not test under Linux")
 class TestNoWX(unittest.TestCase):
     def setUp(self):
         from cellprofiler.preferences import set_headless, set_temporary_directory