Merge branch 'master' of github.com:dcramer/django-devserver

Conflicts: devserver/management/commands/runserver.py
dcramer · Aug 10, 2011 · 18dae5e · 18dae5e
2 parents 9913bfa + 31cf397
commit 18dae5e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/README.rst b/README.rst
@@ -49,7 +49,7 @@ Specify modules to load via the ``DEVSERVER_MODULES`` setting::
 	    'devserver.modules.profile.LineProfilerModule',
 	)
 
-You may also specify prefixes to skip processing for. By default, ``ADMIN_MEDIA_PREFIX`` and ``MEDIA_URL`` will be ignored (assuming ``MEDIA_URL`` is relative)::
+You may also specify prefixes to skip processing for. By default, ``ADMIN_MEDIA_PREFIX``, ``MEDIA_URL`` and ``STATIC_URL`` (for Django >= 1.3) will be ignored (assuming ``MEDIA_URL`` and ``STATIC_URL`` is relative)::
 
 	DEVSERVER_IGNORED_PREFIXES = ['/media', '/uploads']
 

diff --git a/devserver/management/commands/runserver.py b/devserver/management/commands/runserver.py
@@ -130,7 +130,7 @@ def inner_run():
                         use_reloader=use_reloader, use_debugger=True)
                 else:
                     run(addr, int(port), app, mixin)
-            except WSGIServerException:
+            except WSGIServerException, e:
                 # Use helpful error messages instead of ugly tracebacks.
                 ERRORS = {
                     13: "You don't have permission to access that port.",