Use supervisor.compat instead of catching ImportError

supervisor/tests/test_confecho.py

@@ -2,10 +2,7 @@
 
 import sys
 import unittest
-try:
-    from StringIO import StringIO
-except ImportError:
-    from io import StringIO
+from supervisor.compat import StringIO
 from supervisor import confecho
 
 class TopLevelFunctionTests(unittest.TestCase):

supervisor/tests/test_rpcinterfaces.py

@@ -1225,10 +1225,7 @@ class SupervisorNamespaceXMLRPCInterfaceTests(TestBase):
 
     def test_tailProcessStdoutLog_all(self):
         # test entire log is returned when offset==0 and logsize < length
-        try:
-            from string import letters
-        except ImportError:
-            from string import ascii_letters as letters
+        from supervisor.compat import letters
         options = DummyOptions()
         pconfig = DummyPConfig(options, 'foo', '/bin/foo',
                                stdout_logfile='/tmp/fooooooo')
@@ -1253,10 +1250,7 @@ class SupervisorNamespaceXMLRPCInterfaceTests(TestBase):
 
     def test_tailProcessStdoutLog_none(self):
         # test nothing is returned when offset <= logsize
-        try:
-            from string import letters
-        except ImportError:
-            from string import ascii_letters as letters
+        from supervisor.compat import letters
         options = DummyOptions()
         pconfig = DummyPConfig(options, 'foo', '/bin/foo',
                                stdout_logfile='/tmp/fooooooo')
@@ -1291,10 +1285,7 @@ class SupervisorNamespaceXMLRPCInterfaceTests(TestBase):
 
     def test_tailProcessStdoutLog_overflow(self):
         # test buffer overflow occurs when logsize > offset+length
-        try:
-            from string import letters
-        except ImportError:
-            from string import ascii_letters as letters
+        from supervisor.compat import letters
         options = DummyOptions()
         pconfig = DummyPConfig(options, 'foo', '/bin/foo',
                               stdout_logfile='/tmp/fooooooo')
@@ -1348,10 +1339,7 @@ class SupervisorNamespaceXMLRPCInterfaceTests(TestBase):
 
     def test_tailProcessStderrLog_all(self):
         # test entire log is returned when offset==0 and logsize < length
-        try:
-            from string import letters
-        except ImportError:
-            from string import ascii_letters as letters
+        from supervisor.compat import letters
         options = DummyOptions()
         pconfig = DummyPConfig(options, 'foo', '/bin/foo',
                                stderr_logfile='/tmp/fooooooo')
@@ -1376,10 +1364,7 @@ class SupervisorNamespaceXMLRPCInterfaceTests(TestBase):
 
     def test_tailProcessStderrLog_none(self):
         # test nothing is returned when offset <= logsize
-        try:
-            from string import letters
-        except ImportError:
-            from string import ascii_letters as letters
+        from supervisor.compat import letters
         options = DummyOptions()
         pconfig = DummyPConfig(options, 'foo', '/bin/foo',
                                stderr_logfile='/tmp/fooooooo')
@@ -1414,10 +1399,7 @@ class SupervisorNamespaceXMLRPCInterfaceTests(TestBase):
 
     def test_tailProcessStderrLog_overflow(self):
         # test buffer overflow occurs when logsize > offset+length
-        try:
-            from string import letters
-        except ImportError:
-            from string import ascii_letters as letters
+        from supervisor.compat import letters
         options = DummyOptions()
         pconfig = DummyPConfig(options, 'foo', '/bin/foo',
                               stderr_logfile='/tmp/fooooooo')

supervisor/tests/test_supervisorctl.py

@@ -1,12 +1,7 @@
 import sys
 import unittest
-try:
-    from StringIO import StringIO
-    import xmlrpclib
-except ImportError:
-    from io import StringIO
-    import xmlrpc.client as xmlrpclib
-
+from supervisor.compat import StringIO
+from supervisor.compat import xmlrpclib
 from supervisor.tests.base import DummyRPCServer
 
 class ControllerTests(unittest.TestCase):

supervisor/tests/test_supervisord.py

@@ -13,10 +13,7 @@ from supervisor.tests.base import DummyProcess
 from supervisor.tests.base import DummyProcessGroup
 from supervisor.tests.base import DummyDispatcher
 
-try:
-    from StringIO import StringIO
-except ImportError:
-    from io import StringIO
+from supervisor.compat import StringIO
 
 class EntryPointTests(unittest.TestCase):
     def test_main_noprofile(self):

supervisor/tests/test_xmlrpc.py

@@ -5,12 +5,8 @@ from supervisor.tests.base import DummySupervisor
 from supervisor.tests.base import DummyRequest
 from supervisor.tests.base import DummySupervisorRPCNamespace
 
-try:
-    import xmlrpclib
-    import httplib
-except ImportError:
-    import xmlrpc.client as xmlrpclib
-    import http.client as httplib
+from supervisor.compat import xmlrpclib
+from supervisor.compat import httplib
 
 class GetFaultDescriptionTests(unittest.TestCase):
     def test_returns_description_for_known_fault(self):
@@ -452,7 +448,7 @@ class TestDeferredXMLRPCResponse(unittest.TestCase):
         self.assertEqual(inst.request._error, 500)
         self.assertTrue(inst.finished)
         self.assertTrue(called)
-        
+
 class DummyResponse:
     def __init__(self, status=200, body='', reason='reason'):
         self.status = status