p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

magic-removal: changed explicit settings import to qualified settings import in django.core.management 

git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2007 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Georg Bauer 2006-01-16 15:27:30 +00:00
parent 679b8f0d06
commit 41e36aba95
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
django/core/management.py
View File

@ -284,7 +284,7 @@ get_sql_reset.args = APP_ARGS
def get_sql_initial_data(app): def get_sql_initial_data(app):
"Returns a list of the initial INSERT SQL statements for the given app." "Returns a list of the initial INSERT SQL statements for the given app."
from django.conf.settings import DATABASE_ENGINE from django.conf import settings
from django.db.models import get_models from django.db.models import get_models
output = [] output = []
@ -298,7 +298,7 @@ def get_sql_initial_data(app):
# Add custom SQL, if it's available. # Add custom SQL, if it's available.
# FIXME: THis probably needs changing # FIXME: THis probably needs changing
sql_files = [os.path.join(app_dir, opts.module_name + '.' + DATABASE_ENGINE + '.sql'), sql_files = [os.path.join(app_dir, opts.module_name + '.' + settings.DATABASE_ENGINE + '.sql'),
os.path.join(app_dir, opts.module_name + '.sql')] os.path.join(app_dir, opts.module_name + '.sql')]
for sql_file in sql_files: for sql_file in sql_files:
if os.path.exists(sql_file): if os.path.exists(sql_file):
@ -460,8 +460,8 @@ def init_minimal():
from django.db import backend, connection, models from django.db import backend, connection, models
cursor = connection.cursor() cursor = connection.cursor()
# This should probably be done in the test runner, or the test itself. # This should probably be done in the test runner, or the test itself.
from django.conf.settings import INSTALLED_APPS from django.conf import settings
INSTALLED_APPS += ('django.contrib.contenttypes',) settings.INSTALLED_APPS += ('django.contrib.contenttypes',)
# Install django.contrib.contenttypes. The tests require Packages to # Install django.contrib.contenttypes. The tests require Packages to
# to be installed. This ought to be fixed (tests should probably # to be installed. This ought to be fixed (tests should probably
# install their dependencies) # install their dependencies)
@ -884,10 +884,10 @@ def runserver(addr, port):
sys.stderr.write("Error: %r is not a valid port number.\n" % port) sys.stderr.write("Error: %r is not a valid port number.\n" % port)
sys.exit(1) sys.exit(1)
def inner_run(): def inner_run():
from django.conf.settings import SETTINGS_MODULE from django.conf import settings
print "Validating models..." print "Validating models..."
validate() validate()
print "\nStarting server on port %s with settings module %r." % (port, SETTINGS_MODULE) print "\nStarting server on port %s with settings module %r." % (port, settings.SETTINGS_MODULE)
print "Go to http://%s:%s/ for Django." % (addr, port) print "Go to http://%s:%s/ for Django." % (addr, port)
print "Quit the server with CONTROL-C (Unix) or CTRL-BREAK (Windows)." print "Quit the server with CONTROL-C (Unix) or CTRL-BREAK (Windows)."
try: try: