Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' into upstream-trunk

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9843 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit fd28d04c39f83672f674aa2d83557db36a70b4b5 1 parent 8ada8d7
@jacobian jacobian authored
Showing with 7 additions and 4 deletions.
  1. +7 −4 django/core/management/__init__.py
View
11 django/core/management/__init__.py
@@ -319,15 +319,18 @@ def setup_environ(settings_mod, original_settings_path=None):
if settings_name.endswith("$py"):
settings_name = settings_name[:-3]
- sys.path.append(os.path.join(project_directory, os.pardir))
- project_module = __import__(project_name, {}, {}, [''])
- sys.path.pop()
-
# Set DJANGO_SETTINGS_MODULE appropriately.
if original_settings_path:
os.environ['DJANGO_SETTINGS_MODULE'] = original_settings_path
else:
os.environ['DJANGO_SETTINGS_MODULE'] = '%s.%s' % (project_name, settings_name)
+
+ # Import the project module. We add the parent directory to PYTHONPATH to
+ # avoid some of the path errors new users can have.
+ sys.path.append(os.path.join(project_directory, os.pardir))
+ project_module = __import__(project_name, {}, {}, [''])
+ sys.path.pop()
+
return project_directory
def execute_from_command_line(argv=None):
Please sign in to comment.
Something went wrong with that request. Please try again.