Changeset 5696

Timestamp:

07/14/07 09:47:14 (1 year ago)

Author:

mtredinnick

Message:

Fixed #4731 -- Changed management.setup_environ() so that it no longer assumes
the settings module is called "settings". Patch from SmileyChris?.

Files:

• django/trunk/django/core/management.py (modified) (2 diffs)

django/trunk/django/core/management.py

@@ -1714 +1714 @@
-    # way. For example, if this file (manage.py) lives in a directory
-    # "myproject", this code would add "/path/to/myproject" to sys.path.
- = os.path.dirname
+, settings_filename = os.path.split
-    project_name = os.path.basename(project_directory)
+    settings_name = os.path.splitext(settings_filename)[0]
-    sys.path.append(os.path.join(project_directory, '..'))
-    project_module = __import__(project_name, {}, {}, [''])
@@ -1721 +1722 @@
-
-    # Set DJANGO_SETTINGS_MODULE appropriately.
-settings' % project_name
+%s' % (project_name, settings_name)
-    return project_directory
-