Author: adrian
Date: 2006-08-31 16:35:36 -0500 (Thu, 31 Aug 2006)
New Revision: 3691

Modified:
   django/trunk/django/contrib/admin/views/doc.py
Log:
Made extract_views_from_urlpatterns() in admin.views.doc tolerant of URLconfs 
that point to views that don't exist (raise ImportError)

Modified: django/trunk/django/contrib/admin/views/doc.py
===================================================================
--- django/trunk/django/contrib/admin/views/doc.py      2006-08-31 21:32:50 UTC 
(rev 3690)
+++ django/trunk/django/contrib/admin/views/doc.py      2006-08-31 21:35:36 UTC 
(rev 3691)
@@ -334,7 +334,11 @@
             except ViewDoesNotExist:
                 continue
         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:
             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
-~----------~----~----~----~------~----~------~--~---

Reply via email to