Ticket #5222: __init__.py.diff

.py

@@ -7 +7 @@
 # For backwards compatibility: get_version() used to be in this module.
 get_version = django.get_version
 
-def load_command_class(name):
+def find_commands(path):
     """
-    Given a command name, returns the Command class instance. Raises
-    ImportError if it doesn't exist.
+    Given a path to a management directory, return a list of all the command names 
+    that are available. Returns an empty list if no commands are defined.
     """
-    # Let the ImportError propogate.
-    return getattr(__import__('django.core.management.commands.%s' % name, {}, {}, ['Command']), 'Command')()
+    command_dir = os.path.join(path, 'commands')
+    try:
+        return [f[:-3] for f in os.listdir(command_dir) if not f.startswith('_') and f.endswith('.py')]
+    except OSError:
+        return []
+
+def load_default_commands():
+    """
+    Returns a dictionary of instances of all available Command classes.
+
+    This works by looking for and loading all Python modules in the
+    django.core.management.commands package.
+
+    The dictionary is in the format {name: command_instance}.
+    """
+    return dict([(name, getattr(__import__('django.core.management.commands.%s' % (name), {}, {}, ['Command']), 'Command')()) for name in find_commands(__path__[0])])
+
+def load_project_commands():
+    """
+    Returns a dictionary of instances of all available Command classes.
+
+    It looks for a management.commands package in each installed application 
+    -- if a commands package exists, it loads all commands in that 
+    application and raises an AttributeError if a command doesn't contain a 
+    Command instance.
+
+    The dictionary is in the format {name: command_instance}.
+    """
+    
+    commands = {}
+    
+    if 'DJANGO_SETTINGS_MODULE' in os.environ:
+        from django.db import models
+        
+        # Get commands from all installed apps
+        for app in models.get_apps():
+            try:
+                app_name = '.'.join(app.__name__.split('.')[:-1])
+                path = os.path.join(os.path.dirname(app.__file__),'management')
+                commands.update(dict([(name, getattr(__import__('%s.management.commands.%s' % (app_name, name), {}, {}, ['Command']), 'Command')()) for name in find_commands(path)]))
+            except AttributeError:
+                sys.stderr.write("Management command '%s' in application '%s' doesn't contain a Command instance.\n" % (name, app_name))
+                sys.exit(1)
+            
+    return commands
 
 def call_command(name, *args, **options):
     """
@@ -26 +69 @@
         call_command('shell', plain=True)
         call_command('sqlall', 'myapp')
     """
-    klass = load_command_class(name)
+    klass = getattr(__import__(_DJANGO_COMMANDS[name].__module__, {}, {}, ['Command']), 'Command')()
     return klass.execute(*args, **options)
 
 class ManagementUtility(object):
@@ -37 +80 @@
     by editing the self.commands dictionary.
     """
     def __init__(self):
-        self.commands = self.default_commands()
-
-    def default_commands(self):
-        """
-        Returns a dictionary of instances of all available Command classes.
-
-        This works by looking for and loading all Python modules in the
-        django.core.management.commands package.
-
-        The dictionary is in the format {name: command_instance}.
-        """
-        command_dir = os.path.join(__path__[0], 'commands')
-        names = [f[:-3] for f in os.listdir(command_dir) if not f.startswith('_') and f.endswith('.py')]
-        return dict([(name, load_command_class(name)) for name in names])
-
+        self.commands = _DJANGO_COMMANDS
+        
     def usage(self):
         """
         Returns a usage string, for use with optparse.
@@ -161 +191 @@
 
     # Set DJANGO_SETTINGS_MODULE appropriately.
     os.environ['DJANGO_SETTINGS_MODULE'] = '%s.%s' % (project_name, settings_name)
+    
+    # Update default commands with project commands for django internal 
+    # webservers and the manage.py utility
+    _DJANGO_COMMANDS.update(load_project_commands())
+    
     return project_directory
 
 def execute_from_command_line(argv=None):
@@ -178 +213 @@
     project_directory = setup_environ(settings_mod)
     utility = ProjectManagementUtility(project_directory)
     utility.execute(argv)
+    
+# Add default commands to a dict
+_DJANGO_COMMANDS = load_default_commands()
+
+# Update default commands with project commands 
+# when DJANGO_SETTINGS_MODULE is already set.
+_DJANGO_COMMANDS.update(load_project_commands())
+