mirror of
https://github.com/django/django.git
synced 2025-07-05 10:19:20 +00:00
boulder-oracle-sprint: Defer import of backend so django-admin.py doesn't break.
git-svn-id: http://code.djangoproject.com/svn/django/branches/boulder-oracle-sprint@4769 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
c62feba2a3
commit
1bb9c6ffb4
@ -1542,8 +1542,6 @@ def print_error(msg, cmd):
|
|||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
def execute_from_command_line(action_mapping=DEFAULT_ACTION_MAPPING, argv=None):
|
def execute_from_command_line(action_mapping=DEFAULT_ACTION_MAPPING, argv=None):
|
||||||
from django.db import backend
|
|
||||||
|
|
||||||
# Use sys.argv if we've not passed in a custom argv
|
# Use sys.argv if we've not passed in a custom argv
|
||||||
if argv is None:
|
if argv is None:
|
||||||
argv = sys.argv
|
argv = sys.argv
|
||||||
@ -1654,6 +1652,7 @@ def execute_from_command_line(action_mapping=DEFAULT_ACTION_MAPPING, argv=None):
|
|||||||
if not mod_list:
|
if not mod_list:
|
||||||
parser.print_usage_and_exit()
|
parser.print_usage_and_exit()
|
||||||
if action not in NO_SQL_TRANSACTION:
|
if action not in NO_SQL_TRANSACTION:
|
||||||
|
from django.db import backend
|
||||||
print style.SQL_KEYWORD(backend.get_start_transaction_sql())
|
print style.SQL_KEYWORD(backend.get_start_transaction_sql())
|
||||||
for mod in mod_list:
|
for mod in mod_list:
|
||||||
if action == 'reset':
|
if action == 'reset':
|
||||||
|
Loading…
x
Reference in New Issue
Block a user