Django 1.4 upgrade

Signed-off-by: Dan McGee <dpmcgee@gmail.com>

2 files changed, 9 insertions, 11 deletions

diff --git a/manage.py b/manage.py
index 6a43c99..ffd9b63 100755
--- a/manage.py
+++ b/manage.py
@@ -1,11 +1,10 @@
 #!/usr/bin/env python2
-from django.core.management import execute_manager
-try:
-    import settings # Assumed to be in the same directory.
-except ImportError:
-    import sys
-    sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n(If the file settings.py does indeed exist, it's causing an ImportError somehow.)\n" % __file__)
-    sys.exit(1)
+import os
+import sys
 
 if __name__ == "__main__":
-    execute_manager(settings)
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
+
+    from django.core.management import execute_from_command_line
+
+    execute_from_command_line(sys.argv)
diff --git a/settings.py b/settings.py
index c28cbb3..3d5774c 100644
--- a/settings.py
+++ b/settings.py
@@ -32,9 +32,8 @@ USE_L10N = False
 
 USE_ETAGS = True
 
-# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
-# trailing slash.
-ADMIN_MEDIA_PREFIX = '/admin_media/'
+# URL to use for static files
+STATIC_URL = '/static/'
 
 # List of callables that know how to import templates from various sources.
 TEMPLATE_LOADERS = (