Add python 3 support

Ref dcramer#75

Author: coagulant

devserver/management/commands/runserver.py

@@ -9,7 +9,10 @@
 import imp
 import errno
 import socket
-import SocketServer
+try:
+    import socketserver
+except ImportError:
+    import SocketServer as socketserver
 from optparse import make_option
 
 from devserver.handlers import DevServerHandler
@@ -26,7 +29,7 @@
 
 
 def null_technical_500_response(request, exc_type, exc_value, tb):
-    raise exc_type, exc_value, tb
+    raise exc_type(exc_value, tb)
 
 
 def run(addr, port, wsgi_handler, mixin=None, ipv6=False):
@@ -138,7 +141,7 @@ def inner_run(self, *args, **options):
         if use_werkzeug:
             try:
                 from werkzeug import run_simple, DebuggedApplication
-            except ImportError, e:
+            except ImportError as e:
                 self.stderr.write("WARNING: Unable to initialize werkzeug: %s\n" % e)
                 use_werkzeug = False
             else:
@@ -181,9 +184,9 @@ def inner_run(self, *args, **options):
                     raise
 
         if options['use_forked']:
-            mixin = SocketServer.ForkingMixIn
+            mixin = socketserver.ForkingMixIn
         else:
-            mixin = SocketServer.ThreadingMixIn
+            mixin = socketserver.ThreadingMixIn
 
         middleware = getattr(settings, 'DEVSERVER_WSGI_MIDDLEWARE', [])
         for middleware in middleware:
@@ -202,7 +205,7 @@ def inner_run(self, *args, **options):
             else:
                 run(self.addr, int(self.port), app, mixin, ipv6=options['use_ipv6'])
 
-        except wsgi_server_exc_cls, e:
+        except wsgi_server_exc_cls as e:
             # Use helpful error messages instead of ugly tracebacks.
             ERRORS = {
                 errno.EACCES: "You don't have permission to access that port.",

devserver/models.py

@@ -17,17 +17,17 @@ def load_modules():
         try:
             name, class_name = path.rsplit('.', 1)
         except ValueError:
-            raise exceptions.ImproperlyConfigured, '%s isn\'t a devserver module' % path
+            raise exceptions.ImproperlyConfigured('%s isn\'t a devserver module' % path)
 
         try:
             module = __import__(name, {}, {}, [''])
-        except ImportError, e:
-            raise exceptions.ImproperlyConfigured, 'Error importing devserver module %s: "%s"' % (name, e)
+        except ImportError as e:
+            raise exceptions.ImproperlyConfigured('Error importing devserver module %s: "%s"' % (name, e))
 
         try:
             cls = getattr(module, class_name)
         except AttributeError:
-            raise exceptions.ImproperlyConfigured, 'Error importing devserver module "%s" does not define a "%s" class' % (name, class_name)
+            raise exceptions.ImproperlyConfigured('Error importing devserver module "%s" does not define a "%s" class' % (name, class_name))
 
         try:
             instance = cls(GenericLogger(cls))

devserver/testcases.py

@@ -1,5 +1,8 @@
 import socket
-import SocketServer
+try:
+    import socketserver
+except ImportError:
+    import SocketServer as socketserver
 import threading
 
 from django.conf import settings
@@ -68,14 +71,14 @@ def run(self):
         try:
             server_address = (self.address, self.port)
 
-            class new(SocketServer.ThreadingMixIn, StoppableWSGIServer):
+            class new(socketserver.ThreadingMixIn, StoppableWSGIServer):
                 def __init__(self, *args, **kwargs):
                     StoppableWSGIServer.__init__(self, *args, **kwargs)
 
             httpd = new(server_address, SlimWSGIRequestHandler)
             httpd.set_app(handler)
             self.started.set()
-        except wsgi_server_exc_cls, e:
+        except wsgi_server_exc_cls as e:
             self.error = e
             self.started.set()
             return

devserver/utils/stack.py

@@ -1,13 +1,16 @@
 import django
-import SocketServer
+try:
+    import socketserver
+except ImportError:
+    import SocketServer as socketserver
 import os.path
 
 from django.conf import settings
 from django.views.debug import linebreak_iter
 
 # Figure out some paths
 django_path = os.path.realpath(os.path.dirname(django.__file__))
-socketserver_path = os.path.realpath(os.path.dirname(SocketServer.__file__))
+socketserver_path = os.path.realpath(os.path.dirname(socketserver.__file__))
 
 
 def tidy_stacktrace(strace):