Ticket #3530: urlresolvers_reverse_urlconf_func.diff

django/core/urlresolvers.py

@@ -291 +291 @@
-def resolve(path, urlconf=None):
-    return get_resolver(urlconf).resolve(path)
-
+def urlconf_func():
+    from django.conf import settings
+    if not hasattr(settings, 'DYNAMIC_URLCONF_FUNCTION'):
+        return None
+    try:
+        mod_name, func_name = get_mod_func(getattr(settings, 'DYNAMIC_URLCONF_FUNCTION'))
+        return getattr(__import__(mod_name, {}, {}, ['']), func_name)
+    except Exception, e:
+        raise ImproperlyConfigured, "Error while importing DYNAMIC_URLCONF_FUNCTION from settings.py: %s" % (e)
+urlconf_func = urlconf_func()
+
-def reverse(viewname, urlconf=None, args=None, kwargs=None):
+    if urlconf_func and urlconf is None:
+        urlconf = urlconf_func()
-    args = args or []
-    kwargs = kwargs or {}
-    return iri_to_uri(u'/' + get_resolver(urlconf).reverse(viewname, *args, **kwargs))
-