Ticket #496: generic-imports.patch

__init__.py

@@ -68 +68 @@
     return ', '.join(output)
 
 def get_module(app_label, module_name):
-    return __import__('%s.%s.%s' % (MODEL_PREFIX, app_label, module_name), '', '', [''])
+    try:
+        return __import__('%s.%s.%s' % (MODEL_PREFIX, app_label, module_name), '', '', [''])
+    except ImportError, e:
+        try:
+            app =  __import__('%s.%s' % (MODEL_PREFIX, app_label), '', '', [''])
+        except ImportError, e:
+            raise ImportError('Unable to import app_label "%s": %s'
+                    % ( app_label, str(e) ))
+        raise ImportError('Unable to import module_name "%s": '
+                '%s (available choices: %s)'
+                    % ( module_name, str(e), str(dir(app)) ))
 
 def get_app(app_label):
     return __import__('%s.%s' % (MODEL_PREFIX, app_label), '', '', [''])