Python 3 compatibility

praekelt · Mar 30, 2013 · 5354273 · 5354273
1 parent f4eacb4
commit 5354273
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/setup.py b/setup.py
@@ -23,6 +23,7 @@ def read(filepath):
         'coverage',
         'django',
         'pep8',
+        'six',
     ],
     classifiers=[
         "Programming Language :: Python",

diff --git a/setuptest/__init__.py b/setuptest/__init__.py
@@ -2,7 +2,7 @@
 import sys
 
 from setuptools.command.test import test as TestCommand
-from setuptest import LabelException
+from .setuptest import LabelException
 
 class test(TestCommand):
     user_options = TestCommand.user_options + [

diff --git a/setuptest/setuptest.py b/setuptest/setuptest.py
@@ -7,7 +7,7 @@
 
 from coverage import coverage, misc
 from distutils import log
-from StringIO import StringIO
+from six import StringIO
 
 
 class LabelException(Exception):
@@ -88,7 +88,7 @@ def build_tests(self):
                     if self.options['label']:
                         try:
                             tests.append(build_test(package))
-                        except (ImproperlyConfigured, ValueError), e:
+                        except (ImproperlyConfigured, ValueError) as e:
                             self.handle_label_exception(e)
                     else:
                         app = get_app(package)
@@ -101,22 +101,22 @@ def build_tests(self):
                             if self.options['label']:
                                 try:
                                     tests.append(build_test(package))
-                                except (ImproperlyConfigured, ValueError), e:
+                                except (ImproperlyConfigured, ValueError) as e:
                                     self.handle_label_exception(e)
                             else:
                                 app = get_app(package)
                                 tests.append(build_suite(app))
                             break
                         except LabelException:
                             raise
-                        except Exception, e:
+                        except Exception as e:
                             if exception != str(e):
                                 traceback.print_exc()
                             exception = str(e)
                             time.sleep(1)
-            except ImproperlyConfigured, e:
+            except ImproperlyConfigured as e:
                 log.info("Warning: %s" % e)
-            except ImportError, e:
+            except ImportError as e:
                 log.info("Warning: %s" % e)
 
         return tests
@@ -129,7 +129,7 @@ def configure(self):
         from django.utils.importlib import import_module
         try:
             test_settings = import_module('test_settings')
-        except ImportError, e:
+        except ImportError as e:
             log.info('ImportError: Unable to import test settings: %s' % e)
             sys.exit(1)
 
@@ -154,7 +154,7 @@ def coverage_report(self):
                 omit = ['*tests*']
                 self.cov.report(include=include, omit=omit)
                 self.cov.xml_report(include=include, omit=omit)
-            except misc.CoverageException, e:
+            except misc.CoverageException as e:
                 log.info("Coverage Exception: %s" % e)
 
     def resolve_packages(self):