Ticket #6251: rename_project_dir.diff

django/conf/project_template/settings.py

@@ -1 +1 @@
 # Django settings for {{ project_name }} project.
 
+PROJECT_NAME = '{{ project_name }}'
+
 DEBUG = True
 TEMPLATE_DEBUG = DEBUG
 

django/core/management/__init__.py

@@ -1 +1 @@
 import os
 import sys
 from optparse import OptionParser
-from imp import find_module
+import imp
 
 import django
 from django.core.management.base import BaseCommand, CommandError, handle_default_options
@@ -40 +40 @@
     path = None
     while parts:
         part = parts.pop()
-        f, path, descr = find_module(part, path and [path] or None)
+        f, path, descr = imp.find_module(part, path and [path] or None)
     return path
 
 def load_command_class(app_name, name):
@@ -239 +239 @@
     Returns the project directory (assuming the passed settings module is
     directly in the project directory).
     """
-    # Add this project to sys.path so that it's importable in the conventional
-    # way. For example, if this file (manage.py) lives in a directory
-    # "myproject", this code would add "/path/to/myproject" to sys.path.
-    project_directory, settings_filename = os.path.split(settings_mod.__file__)
-    if not project_directory:
-        project_directory = os.getcwd()
-    project_name = os.path.basename(project_directory)
+    project_directory, settings_filename = os.path.split(
+        os.path.abspath(settings_mod.__file__))
+    try:
+        project_name = settings_mod.PROJECT_NAME
+    except AttributeError:
+        project_name = os.path.basename(project_directory)
     settings_name = os.path.splitext(settings_filename)[0]
-    sys.path.append(os.path.join(project_directory, os.pardir))
-    project_module = __import__(project_name, {}, {}, [''])
-    sys.path.pop()
+    project_module = imp.load_module(project_name, None, project_directory,
+                                     ('', '', imp.PKG_DIRECTORY))
 
     # Set DJANGO_SETTINGS_MODULE appropriately.
     os.environ['DJANGO_SETTINGS_MODULE'] = '%s.%s' % (project_name, settings_name)