Merge pull request #60 from streeter/patch-2

dcramer · dcramer · commit 5d8abcfc355a · 2012-07-02T22:59:42.000-07:00
Support external staticfiles app
diff --git a/devserver/management/commands/runserver.py b/devserver/management/commands/runserver.py
@@ -47,7 +47,7 @@ class Command(BaseCommand):
         make_option('--wsgi-app', dest='wsgi_app', default=None,
             help='Load the specified WSGI app as the server endpoint.'),
     )
-    if 'django.contrib.staticfiles' in settings.INSTALLED_APPS:
+    if any(map(lambda app: app in settings.INSTALLED_APPS, ('django.contrib.staticfiles', 'staticfiles', ))):
         option_list += make_option('--nostatic', dest='use_static_files', default=True,
                           help='Tells Django to NOT automatically serve static files at STATIC_URL.'),
 

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ class Command(BaseCommand):`
`47`	`47`	`make_option('--wsgi-app', dest='wsgi_app', default=None,`
`48`	`48`	`help='Load the specified WSGI app as the server endpoint.'),`
`49`	`49`	`)`
`50`		`- if 'django.contrib.staticfiles' in settings.INSTALLED_APPS:`
	`50`	`+ if any(map(lambda app: app in settings.INSTALLED_APPS, ('django.contrib.staticfiles', 'staticfiles', ))):`
`51`	`51`	`option_list += make_option('--nostatic', dest='use_static_files', default=True,`
`52`	`52`	`help='Tells Django to NOT automatically serve static files at STATIC_URL.'),`
`53`	`53`