Merge branch 'master' into rwd

[wolnelektury.git] / manage.py

diff --git a/manage.py b/manage.py
index 5e78ea9..a03a13a 100755 (executable)
--- a/manage.py
+++ b/manage.py
@@ -1,11 +1,17 @@
 #!/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:
-    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
+
+ROOT = os.path.dirname(os.path.abspath(__file__))
+sys.path = [
+    os.path.join(ROOT, 'apps'),
+    os.path.join(ROOT, 'lib'),
+    os.path.join(ROOT, 'lib/librarian'),
+] + sys.path

 
 if __name__ == "__main__":
 
 if __name__ == "__main__":

-    execute_manager(settings)
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "wolnelektury.settings")
+
+    from django.core.management import execute_from_command_line
+
+    execute_from_command_line(sys.argv)