Ticket #14087: patch_14087_manage_trunk.diff

django/core/management/__init__.py

@@ -14 +14 @@
 # doesn't have to reload every time it's called.
 _commands = None
 
-def find_commands(management_dir):
+def find_commands(management_dirs):
     """
-    Given a path to a management directory, returns a list of all the command
-    names that are available.
+    Given a path or a sequence of paths to a management directory,
+    returns a list of all the command names that are available.
 
     Returns an empty list if no commands are defined.
     """
-    command_dir = os.path.join(management_dir, 'commands')
-    try:
-        return [f[:-3] for f in os.listdir(command_dir)
-                if not f.startswith('_') and f.endswith('.py')]
-    except OSError:
-        return []
+    found_commands = []
+    for management_dir in management_dirs:
+        command_dir = os.path.join(management_dir, 'commands')
+        try:
+            found_commands += [f[:-3] for f in os.listdir(command_dir)
+                    if not f.startswith('_') and f.endswith('.py')]
+        except OSError:
+            pass
+        
+    return found_commands
+    
+def _find_all_modules(name, paths = None):
+    """
+    Tries to find module "name" in each element of "paths". Will return
+    a list of tuples returned by imp.find_module.
+    """
+    if paths is None:
+        paths = sys.path
+    found_modules = []
+    for path in paths:
+        try:
+            module = imp.find_module(name, [path])
+            found_modules.append(module)
+        except ImportError:
+            pass
+    if not found_modules:
+        raise ImportError
+    return found_modules
 
 def find_management_module(app_name):
     """
@@ -39 +61 @@
     parts.append('management')
     parts.reverse()
     part = parts.pop()
-    path = None
 
     # When using manage.py, the project module is added to the path,
     # loaded, then removed from the path. This means that
@@ -48 +69 @@
     # module, we need look for the case where the project name is part
     # of the app_name but the project directory itself isn't on the path.
     try:
-        f, path, descr = imp.find_module(part,path)
+        modules = _find_all_modules(part)
+        paths = [x[1] for x in modules]
     except ImportError,e:
         if os.path.basename(os.getcwd()) != part:
             raise e
 
     while parts:
         part = parts.pop()
-        f, path, descr = imp.find_module(part, path and [path] or None)
-    return path
+        modules = _find_all_modules(part, paths)
+        paths = [x[1] for x in modules]
+        
+    # if we did not find any path, this is an ImportError
+    if not paths:
+        raise ImportError
+    
+    return paths
 
 def load_command_class(app_name, name):
     """
@@ -93 +121 @@
     """
     global _commands
     if _commands is None:
-        _commands = dict([(name, 'django.core') for name in find_commands(__path__[0])])
+        _commands = dict([(name, 'django.core') for name in find_commands([__path__[0]])])
 
         # Find the installed apps
         try:
@@ -113 +141 @@
         # Find and load the management module for each installed app.
         for app_name in apps:
             try:
-                path = find_management_module(app_name)
+                paths = find_management_module(app_name)
                 _commands.update(dict([(name, app_name)
-                                       for name in find_commands(path)]))
+                                       for name in find_commands(paths)]))
             except ImportError:
                 pass # No management module - ignore this app