Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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
  • Loading branch information...
commit 901c3708fb8a2e51bddd37358f8e536282a8c266 1 parent 626a341
@freakboy3742 freakboy3742 authored
Showing with 14 additions and 2 deletions.
  1. +14 −2 django/core/management/__init__.py
View
16 django/core/management/__init__.py
@@ -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
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
calls.
"""
@@ -109,7 +113,11 @@ def call_command(name, *args, **options):
"""
try:
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:
raise CommandError, "Unknown command: %r" % name
return klass.execute(*args, **options)
@@ -159,7 +167,11 @@ def fetch_command(self, subcommand):
"""
try:
app_name = get_commands(self.user_commands, self.project_directory)[subcommand]
- klass = load_command_class(app_name, 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)
except KeyError:
sys.stderr.write("Unknown command: %r\nType '%s help' for usage.\n" % (subcommand, self.prog_name))
sys.exit(1)

0 comments on commit 901c370

Please sign in to comment.
Something went wrong with that request. Please try again.