Ticket #19556: url_loader_2.diff

django/conf/urls/__init__.py

@@ -4 +4 @@
 from django.utils.importlib import import_module
 from django.utils import six
 
+import imp
+
 
 __all__ = ['handler403', 'handler404', 'handler500', 'include', 'patterns', 'url']
 
@@ -22 +24 @@
         urlconf_module = arg
 
     if isinstance(urlconf_module, six.string_types):
-        urlconf_module = import_module(urlconf_module)
+        # Attempt to search the namespace packages for all URL modules and append the urlpatterns to the last module found
+        if namespace:
+            try:
+                ns_module = import_module(namespace)
+                package_list = ns_module.__path__
+
+                urlpatterns = []
+
+                for path in package_list:
+                # Search the path for the module name, unpack the find_module tuple and load said module
+                    tmp_module = imp.load_module(arg, *imp.find_module(arg, [path]))
+                    urlconf_module = tmp_module
+                    urlpatterns += tmp_module.urlpatterns
+
+                urlconf_module.urlpatterns = urlpatterns
+            except Exception as ex:
+                raise ImproperlyConfigured('Cannot import namespace for a dynamic url configuration: %s' % (ex))
+        else:
+            urlconf_module = import_module(urlconf_module)
+
     patterns = getattr(urlconf_module, 'urlpatterns', urlconf_module)
 
     # Make sure we can iterate through the patterns (without this, some