Author: jezdez
Date: 2011-08-12 07:15:56 -0700 (Fri, 12 Aug 2011)
New Revision: 16609
Modified:
django/trunk/django/contrib/admindocs/views.py
Log:
Fixed #16573 -- Corrected a regression in the admindocs app's view overview
introduced in r16405. Thanks, lopopolo.
Modified: django/trunk/django/contrib/admindocs/views.py
===================================================================
--- django/trunk/django/contrib/admindocs/views.py 2011-08-12 14:15:50 UTC
(rev 16608)
+++ django/trunk/django/contrib/admindocs/views.py 2011-08-12 14:15:56 UTC
(rev 16609)
@@ -349,17 +349,17 @@
"""
views = []
for p in urlpatterns:
- if hasattr(p, 'callback'):
+ if hasattr(p, 'url_patterns'):
try:
- views.append((p.callback, base + p.regex.pattern))
- except ViewDoesNotExist:
- continue
- elif 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
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
