Commit fd28d04c authored by Jacob Kaplan-Moss's avatar Jacob Kaplan-Moss
Browse files

Merge branch 'master' into upstream-trunk 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9843 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 8ada8d7c

django/core/management/__init__.py

+7 −4
Original line number Diff line number Diff line
@@ -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):