diff options
| -rw-r--r-- | django/contrib/admindocs/views.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/django/contrib/admindocs/views.py b/django/contrib/admindocs/views.py index 1f57900488..28319be9d5 100644 --- a/django/contrib/admindocs/views.py +++ b/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 |