innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #5564 -- Fixed handling of the ProjectCommand used by startapp. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@6402 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Russell Keith-Magee 2007-09-21 17:52:36 +00:00
parent 626a341587
commit 901c3708fb
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
django/core/management/__init__.py
View File

@ -65,6 +65,10 @@ def get_commands(load_user_commands=True, project_directory=None):
pairs from this dictionary can then be used in calls to pairs from this dictionary can then be used in calls to
load_command_class(app_name, command_name) load_command_class(app_name, command_name)
If a specific version of a command must be loaded (e.g., with the
startapp command), the instantiated module can be placed in the
dictionary in place of the application name.
The dictionary is cached on the first call, and reused on subsequent The dictionary is cached on the first call, and reused on subsequent
calls. calls.
""" """
@ -109,7 +113,11 @@ def call_command(name, *args, **options):
""" """
try: try:
app_name = get_commands()[name] app_name = get_commands()[name]
klass = load_command_class(app_name, name) if isinstance(app_name, BaseCommand):
# If the command is already loaded, use it directly.
klass = app_name
else:
klass = load_command_class(app_name, subcommand)
except KeyError: except KeyError:
raise CommandError, "Unknown command: %r" % name raise CommandError, "Unknown command: %r" % name
return klass.execute(*args, **options) return klass.execute(*args, **options)
@ -159,6 +167,10 @@ class ManagementUtility(object):
""" """
try: try:
app_name = get_commands(self.user_commands, self.project_directory)[subcommand] app_name = get_commands(self.user_commands, self.project_directory)[subcommand]
if isinstance(app_name, BaseCommand):
# If the app_name is already loaded, use it directly.
klass = app_name
else:
klass = load_command_class(app_name, subcommand) klass = load_command_class(app_name, subcommand)
except KeyError: except KeyError:
sys.stderr.write("Unknown command: %r\nType '%s help' for usage.\n" % (subcommand, self.prog_name)) sys.stderr.write("Unknown command: %r\nType '%s help' for usage.\n" % (subcommand, self.prog_name))