Ticket #14130: fix14130.patch

django/conf/project_template/manage.py

@@ -1 +1 @@
 #!/usr/bin/env python
 from django.core.management import execute_manager
+from django.utils.importlib import import_module
+import imp
 try:
-    import settings # Assumed to be in the same directory.
+    imp.find_module('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.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." % __file__)
     sys.exit(1)
 
+import settings
+
 if __name__ == "__main__":
     execute_manager(settings)