Migrate to Django 1.6

[osqa.git] / manage.py

diff --git a/manage.py b/manage.py
index f9894f584e6defa2ad62893817cdaabee0e0e20a..f9726f9e67d10a596ac6efaeb114a6c479fa24ca 100644 (file)
--- a/manage.py
+++ b/manage.py
@@ -1,13 +1,10 @@
 #!/usr/bin/env python
 #!/usr/bin/env python

-from django.core.management import execute_manager
-try:
-    import settings # Assumed to be in the same directory.
-except ImportError, e:
-    import traceback
-    traceback.print_exc()
-    import sys
-    sys.stderr.write("Error: Can't find the file 'forms.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 forms.py does indeed exist, it's causing an ImportError somehow.)\n" % __file__)
-    sys.exit(1)
+import os
+import sys

 
 if __name__ == "__main__":
 
 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)