@@ -244,6 +244,10 @@ def __init__(self, regex, urlconf_name, default_kwargs=None, app_name=None, name

self._reverse_dict = {}

self._namespace_dict = {}

self._app_dict = {}

# set of dotted paths to all functions and classes that are used in

# urlpatterns

self._callback_strs = set()

self._populated = False

def __repr__(self):

if isinstance(self.urlconf_name, list) and len(self.urlconf_name):

@@ -261,6 +265,15 @@ def _populate(self):

apps = {}

language_code = get_language()

for pattern in reversed(self.url_patterns):

if hasattr(pattern, '_callback_str'):

self._callback_strs.add(pattern._callback_str)

elif hasattr(pattern, '_callback'):

callback = pattern._callback

if not hasattr(callback, '__name__'):

lookup_str = callback.__module__ + "." + callback.__class__.__name__

else:

lookup_str = callback.__module__ + "." + callback.__name__

self._callback_strs.add(lookup_str)

p_pattern = pattern.regex.pattern

if p_pattern.startswith('^'):

p_pattern = p_pattern[1:]

@@ -281,6 +294,7 @@ def _populate(self):

namespaces[namespace] = (p_pattern + prefix, sub_pattern)

for app_name, namespace_list in pattern.app_dict.items():

apps.setdefault(app_name, []).extend(namespace_list)

self._callback_strs.update(pattern._callback_strs)

else:

bits = normalize(p_pattern)

lookups.appendlist(pattern.callback, (bits, p_pattern, pattern.default_args))

@@ -289,6 +303,7 @@ def _populate(self):

self._reverse_dict[language_code] = lookups

self._namespace_dict[language_code] = namespaces

self._app_dict[language_code] = apps

self._populated = True

@property

def reverse_dict(self):

@@ -375,8 +390,13 @@ def reverse(self, lookup_view, *args, **kwargs):

def _reverse_with_prefix(self, lookup_view, _prefix, *args, **kwargs):

if args and kwargs:

raise ValueError("Don't mix *args and **kwargs in call to reverse()!")

if not self._populated:

self._populate()

try:

lookup_view = get_callable(lookup_view, True)

if lookup_view in self._callback_strs:

lookup_view = get_callable(lookup_view, True)

except (ImportError, AttributeError) as e:

raise NoReverseMatch("Error importing '%s': %s." % (lookup_view, e))

possibilities = self.reverse_dict.getlist(lookup_view)