summaryrefslogtreecommitdiff
path: root/manage.py
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2012-12-12 18:01:59 -0500
committerLuke Shumaker <LukeShu@sbcglobal.net>2012-12-12 18:01:59 -0500
commit764182c0ca66b538cef994409f04f876681598cd (patch)
tree2f399c618484c00f84875b437f3fcfcc9c509424 /manage.py
parent8844fd0c6361d3a6ccd88647276e9af0e6cd64d2 (diff)
parent822898e57bc6d4e008ef58da309857e9ef8c98e6 (diff)
Merge commit '822898e' (Merge branch 'django14')
Conflicts: requirements.txt requirements_prod.txt templates/base.html templates/devel/clock.html templates/public/download.html templates/public/index.html templates/releng/results.html
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:
-