Python 3.x fixes

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):
@@ -141,7 +144,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:
@@ -205,7 +208,7 @@ def inner_run(self, *args, **options):
             else:
                 run(self.addr, int(self.port), app, mixin, ipv6=self.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/middleware.py

@@ -1,7 +1,9 @@
+from django.utils.deprecation import MiddlewareMixin
+
 from devserver.models import MODULES
 
 
-class DevServerMiddleware(object):
+class DevServerMiddleware(MiddlewareMixin):
     def should_process(self, request):
         from django.conf import settings
 

devserver/models.py

@@ -17,17 +17,19 @@ 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/modules/cache.py

@@ -43,7 +43,7 @@ def process_complete(self, request):
             ), duration=stats.get_total_time('cache'))
 
         # set our attributes back to their defaults
-        for k, v in self.old.iteritems():
+        for k, v in self.old.items():
             setattr(cache, k, v)
 
 

devserver/modules/sql.py

@@ -12,7 +12,7 @@
     from django.db import connection
     connections = {'default': connection}
 
-from django.db.backends import util
+from django.db.backends import utils
 from django.conf import settings as django_settings
 #from django.template import Node
 
@@ -52,9 +52,9 @@ def truncate_sql(sql, aggregates=True):
     import django
     version = float('.'.join([str(x) for x in django.VERSION[:2]]))
     if version >= 1.6:
-        DatabaseStatTracker = util.CursorWrapper
+        DatabaseStatTracker = utils.CursorWrapper
     else:
-        DatabaseStatTracker = util.CursorDebugWrapper
+        DatabaseStatTracker = utils.CursorDebugWrapper
 
 
 class DatabaseStatTracker(DatabaseStatTracker):
@@ -126,14 +126,14 @@ class SQLRealTimeModule(DevServerModule):
     logger_name = 'sql'
 
     def process_init(self, request):
-        if not issubclass(util.CursorDebugWrapper, DatabaseStatTracker):
-            self.old_cursor = util.CursorDebugWrapper
-            util.CursorDebugWrapper = DatabaseStatTracker
+        if not issubclass(utils.CursorDebugWrapper, DatabaseStatTracker):
+            self.old_cursor = utils.CursorDebugWrapper
+            utils.CursorDebugWrapper = DatabaseStatTracker
         DatabaseStatTracker.logger = self.logger
 
     def process_complete(self, request):
-        if issubclass(util.CursorDebugWrapper, DatabaseStatTracker):
-            util.CursorDebugWrapper = self.old_cursor
+        if issubclass(utils.CursorDebugWrapper, DatabaseStatTracker):
+            utils.CursorDebugWrapper = self.old_cursor
 
 
 class SQLSummaryModule(DevServerModule):

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
@@ -75,7 +78,7 @@ def __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