summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Church <chris@ninemoreminutes.com>2013-03-13 20:24:43 +0100
committerChris Church <chris@ninemoreminutes.com>2013-03-13 20:24:43 +0100
commite0892664913fe3382e50874fc72a0b727286252b (patch)
treeea9e99e4d8632314f6dfac85b44bb8c76d3c7e21
parentmove manage.py up one level (diff)
downloadawx-e0892664913fe3382e50874fc72a0b727286252b.tar.xz
awx-e0892664913fe3382e50874fc72a0b727286252b.zip
Updated manage.py to use environment variable instead of importing settings directly.
-rwxr-xr-xmanage.py16
1 files changed, 7 insertions, 9 deletions
diff --git a/manage.py b/manage.py
index 5e78ea979e..51308839b4 100755
--- a/manage.py
+++ b/manage.py
@@ -1,11 +1,9 @@
#!/usr/bin/env python
-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)
-if __name__ == "__main__":
- execute_manager(settings)
+import os
+import sys
+
+if __name__ == '__main__':
+ os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'acom.settings')
+ from django.core.management import execute_from_command_line
+ execute_from_command_line(sys.argv)