Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #16573 -- Corrected a regression in the admindocs app's view ov…

…erview introduced in r16405. Thanks, lopopolo.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16609 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit a539d434d9451eb201d8b79b45740e192c1736ca 1 parent 02dcbe3
@jezdez jezdez authored
Showing with 6 additions and 6 deletions.
  1. +6 −6 django/contrib/admindocs/views.py
View
12 django/contrib/admindocs/views.py
@@ -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
Please sign in to comment.
Something went wrong with that request. Please try again.