mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-26 07:06:08 +00:00
Code Issues 32 Releases Wiki Activity

Made extract_views_from_urlpatterns() in admin.views.doc tolerant of URLconfs that point to views that don't exist (raise ImportError)

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3691 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty
2006-08-31 21:35:36 +00:00
parent d39b5cae68
commit 93b1f9ad6e
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
django/contrib/admin/views/doc.py
View File

@@ -334,7 +334,11 @@ def extract_views_from_urlpatterns(urlpatterns, base=''):
except ViewDoesNotExist: except ViewDoesNotExist:
continue continue
elif hasattr(p, '_get_url_patterns'): elif hasattr(p, '_get_url_patterns'):
views.extend(extract_views_from_urlpatterns(p.url_patterns, base + p.regex.pattern)) try:
patterns = p.url_patterns
except ImportError:
continue
views.extend(extract_views_from_urlpatterns(patterns, base + p.regex.pattern))
else: else:
raise TypeError, _("%s does not appear to be a urlpattern object") % p raise TypeError, _("%s does not appear to be a urlpattern object") % p
return views return views