Ticket #10323: mocksoul_dont_force_admin_media_serving.patch

django/core/management/commands/runserver.py

@@ -9 +9 @@
             help='Tells Django to NOT use the auto-reloader.'),
         make_option('--adminmedia', dest='admin_media_path', default='',
             help='Specifies the directory from which to serve admin media.'),
+        make_option('--disable-admin-media', action='store_false', dest='serve_admin_media', default=True,
+            help='Disable serving of admin media files.'),
     )
     help = "Starts a lightweight Web server for development."
     args = '[optional port number, or ipaddr:port]'
@@ -37 +39 @@
             raise CommandError("%r is not a valid port number." % port)
 
         use_reloader = options.get('use_reloader', True)
+        serve_admin_media = options.get('serve_admin_media', False)
         admin_media_path = options.get('admin_media_path', '')
         shutdown_message = options.get('shutdown_message', '')
         quit_command = (sys.platform == 'win32') and 'CTRL-BREAK' or 'CONTROL-C'
@@ -50 +53 @@
             print "Quit the server with %s." % quit_command
             try:
                 path = admin_media_path or django.__path__[0] + '/contrib/admin/media'
-                handler = AdminMediaHandler(WSGIHandler(), path)
+                if serve_admin_media:
+                    handler = AdminMediaHandler(WSGIHandler(), path)
+                else:
+                    handler = WSGIHandler()
                 run(addr, int(port), handler)
             except WSGIServerException, e:
                 # Use helpful error messages instead of ugly tracebacks.