Ticket #11642: 11642-default-namespace-r11413.diff

django/conf/urls/defaults.py

@@ -1 +1 @@
 from django.core.urlresolvers import RegexURLPattern, RegexURLResolver
 from django.core.exceptions import ImproperlyConfigured
+from django.utils.importlib import import_module
 
 __all__ = ['handler404', 'handler500', 'include', 'patterns', 'url']
 
@@ -8 +9 @@
 
 def include(arg, namespace=None, app_name=None):
     if isinstance(arg, tuple):
-        # callable returning a namespace hint
-        if namespace:
-            raise ImproperlyConfigured('Cannot override the namespace for a dynamic module that provides a namespace')
-        urlconf_module, app_name, namespace = arg
+        urlconf_module = arg[0]
+        app_name = app_name or arg[1]
+        namespace = namespace or arg[2] or app_name
     else:
-        # No namespace hint - use manually provided namespace
-        urlconf_module = arg
+        if isinstance(arg, basestring):
+            urlconf_module = import_module(arg)
+        else:
+            urlconf_module = arg
+        # Get the default application namespace, specified in the app's urlconf.
+        app_name = app_name or getattr(urlconf_module, 'app_name', None)
+        # Use the app name as the default instance namespace.
+        namespace = namespace or app_name
     return (urlconf_module, app_name, namespace)
 
 def patterns(prefix, *args):