Ticket #2947: management_import_patch.diff

django/core/management.py

@@ -429 +429 @@
 get_sql_all.help_doc = "Prints the CREATE TABLE, initial-data and CREATE INDEX SQL statements for the given model module name(s)."
 get_sql_all.args = APP_ARGS
 
+def _find_module_with_dots(name, paths=None):
+    """Like imp.find_module, but supports module names with zero or more dots."""
+    import imp
+    dotindex = name.find('.')
+    if dotindex == -1:
+        return imp.find_module(name, paths)
+    else:
+        parent_name = name[:dotindex]
+        parent_path = imp.find_module(parent_name, paths)[1]
+        return _find_module_with_dots(name[dotindex+1:], [parent_path])
+
+def _module_exists(modulename):
+    try:
+        _find_module_with_dots(modulename)
+        return True
+    except ImportError:
+        return False
+
+
+def _import_module_if_it_exists(modname, *args, **kwargs):
+    try:
+        return __import__(modname, *args, **kwargs)
+    except ImportError, e:
+        if _module_exists(modname):
+            # the module exists and yet raised an ImportError. Why?
+            raise e
+        else:
+            # it's okay if the module doesn't exist
+            return False
+    
 def syncdb(verbosity=1, interactive=True):
     "Creates the database tables for all apps in INSTALLED_APPS whose tables haven't already been created."
     from django.db import connection, transaction, models, get_creation_module
@@ -444 +474 @@
     # Import the 'management' module within each installed app, to register
     # dispatcher events.
     for app_name in settings.INSTALLED_APPS:
-        try:
-            __import__(app_name + '.management', '', '', [''])
-        except ImportError:
-            pass
-
+        modname = app_name + '.management'
+        _import_module_if_it_exists(modname)
+            
     data_types = get_creation_module().DATA_TYPES
 
     cursor = connection.cursor()