Handle removal of WSGIServerException in Django 1.6

Author: mkai

devserver/management/commands/runserver.py

@@ -1,18 +1,26 @@
 from django.conf import settings
 from django.core.management.commands.runserver import Command as BaseCommand
 from django.core.management.base import CommandError, handle_default_options
-from django.core.servers.basehttp import WSGIServerException, WSGIServer
+from django.core.servers.basehttp import WSGIServer
 from django.core.handlers.wsgi import WSGIHandler
 
 import os
 import sys
 import imp
+import errno
+import socket
 import SocketServer
 from optparse import make_option
 
 from devserver.handlers import DevServerHandler
 from devserver.utils.http import SlimWSGIRequestHandler
 
+try:
+    from django.core.servers.basehttp import (WSGIServerException as
+                                              wsgi_server_exc_cls)
+except ImportError:  # Django 1.6
+    wsgi_server_exc_cls = socket.error
+
 
 STATICFILES_APPS = ('django.contrib.staticfiles', 'staticfiles')
 
@@ -189,15 +197,23 @@ def inner_run(self, *args, **options):
             else:
                 run(self.addr, int(self.port), app, mixin, ipv6=options['use_ipv6'])
 
-        except WSGIServerException, e:
+        except wsgi_server_exc_cls, e:
             # Use helpful error messages instead of ugly tracebacks.
             ERRORS = {
-                13: "You don't have permission to access that port.",
-                98: "That port is already in use.",
-                99: "That IP address can't be assigned-to.",
+                errno.EACCES: "You don't have permission to access that port.",
+                errno.EADDRINUSE: "That port is already in use.",
+                errno.EADDRNOTAVAIL: "That IP address can't be assigned-to.",
             }
+            if not isinstance(e, socket.error):  # Django < 1.6
+                ERRORS[13] = ERRORS.pop(errno.EACCES)
+                ERRORS[98] = ERRORS.pop(errno.EADDRINUSE)
+                ERRORS[99] = ERRORS.pop(errno.EADDRNOTAVAIL)
+
             try:
-                error_text = ERRORS[e.args[0].args[0]]
+                if not isinstance(e, socket.error):  # Django < 1.6
+                    error_text = ERRORS[e.args[0].args[0]]
+                else:
+                    error_text = ERRORS[e.errno]
             except (AttributeError, KeyError):
                 error_text = str(e)
             sys.stderr.write(self.style.ERROR("Error: %s" % error_text) + '\n')

devserver/testcases.py

@@ -5,10 +5,16 @@
 from django.conf import settings
 from django.core.handlers.wsgi import WSGIHandler
 from django.core.management import call_command
-from django.core.servers.basehttp import WSGIServer, AdminMediaHandler, WSGIServerException
+from django.core.servers.basehttp import WSGIServer, AdminMediaHandler
 
 from devserver.utils.http import SlimWSGIRequestHandler
 
+try:
+    from django.core.servers.basehttp import (WSGIServerException as
+                                              wsgi_server_exc_cls)
+except ImportError:  # Django 1.6
+    wsgi_server_exc_cls = socket.error
+
 
 class StoppableWSGIServer(WSGIServer):
     """WSGIServer with short timeout, so that server thread can stop this server."""
@@ -52,7 +58,7 @@ def __init__(self, *args, **kwargs):
             httpd = new(server_address, SlimWSGIRequestHandler)
             httpd.set_app(handler)
             self.started.set()
-        except WSGIServerException, e:
+        except wsgi_server_exc_cls, e:
             self.error = e
             self.started.set()
             return