Ticket #4436: django_manage.patch

home/eta/workspace/django_svn/django/conf/project_template/manage.py

@@ -1 +1 @@
 #!/usr/bin/env python
 from django.core.management import execute_manager
 try:
-    import settings # Assumed to be in the same directory.
+    import os
+    settings_module = os.environ.get('DJANGO_SETTINGS_MODULE', 'settings')
+    settings = __import__(settings_module, {}, {}, [''])
 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__)

home/eta/workspace/django_svn/docs/django-admin.txt

@@ -7 +7 @@
 
 In addition, ``manage.py`` is automatically created in each Django project.
 ``manage.py`` is a thin wrapper around ``django-admin.py`` that takes care of
-two things for you before delegating to ``django-admin.py``:
+one thing for you before delegating to ``django-admin.py``:
 
     * It puts your project's package on ``sys.path``.
 
-    * It sets the ``DJANGO_SETTINGS_MODULE`` environment variable so that it
-      points to your project's ``settings.py`` file.
-
 The ``django-admin.py`` script should be on your system path if you installed
 Django via its ``setup.py`` utility. If it's not on your path, you can find it in
 ``site-packages/django/bin`` within your Python installation. Consider

home/eta/workspace/django_svn/examples/manage.py

@@ -1 +1 @@
 #!/usr/bin/env python
 from django.core.management import execute_manager
 try:
-    import settings # Assumed to be in the same directory.
+    import os
+    settings_module = os.environ.get('DJANGO_SETTINGS_MODULE', 'settings')
+    settings = __import__(settings_module, {}, {}, [''])
 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__)