summaryrefslogtreecommitdiff
path: root/manage.py
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2012-03-23 17:46:10 -0500
committerDan McGee <dan@archlinux.org>2012-03-23 19:54:40 -0500
commit7896779ff18b304f8246c24123b8cbf9b82ec5b0 (patch)
treeb7812b60d3b2eb7ed23824a505c878c0176415a2 /manage.py
parent99da2f78b8fbc2577f82895074ae868683e0ed5e (diff)
Bump requirements to Django 1.4 and add new manage.py
The default manage.py script has been updated in Django 1.4, and the old version and functions it calls is deprecated. Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'manage.py')
-rwxr-xr-xmanage.py16
1 files changed, 6 insertions, 10 deletions
diff --git a/manage.py b/manage.py
index 317dd156..debb55e5 100755
--- a/manage.py
+++ b/manage.py
@@ -1,16 +1,12 @@
#!/usr/bin/env python2
+import os
+import sys
-from django.core.management import execute_manager
+if __name__ == "__main__":
+ os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
-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" % __file__)
- sys.exit(1)
+ from django.core.management import execute_from_command_line
-if __name__ == "__main__":
- execute_manager(settings)
+ execute_from_command_line(sys.argv)
# vim: set ts=4 sw=4 et:
-