Commit a539d434 authored by Jannis Leidel's avatar Jannis Leidel
Browse files

Fixed #16573 -- Corrected a regression in the admindocs app's view overview...

Fixed #16573 -- Corrected a regression in the admindocs app's view overview introduced in r16405. Thanks, lopopolo.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16609 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 02dcbe33
Loading
Loading
Loading
Loading
+6 −6
Original line number Diff line number Diff line
@@ -349,17 +349,17 @@ def extract_views_from_urlpatterns(urlpatterns, base=''):
    """
    views = []
    for p in urlpatterns:
        if hasattr(p, 'callback'):
            try:
                views.append((p.callback, base + p.regex.pattern))
            except ViewDoesNotExist:
                continue
        elif hasattr(p, 'url_patterns'):
        if hasattr(p, 'url_patterns'):
            try:
                patterns = p.url_patterns
            except ImportError:
                continue
            views.extend(extract_views_from_urlpatterns(patterns, base + p.regex.pattern))
        elif hasattr(p, 'callback'):
            try:
                views.append((p.callback, base + p.regex.pattern))
            except ViewDoesNotExist:
                continue
        else:
            raise TypeError(_("%s does not appear to be a urlpattern object") % p)
    return views