[Checkins] SVN: Sandbox/ulif/grokui.codebrowser/src/grokui/codebrowser/codebrowser.py Minor cleanups.

Uli Fouquet uli at gnufix.de
Fri Mar 19 19:37:45 EDT 2010


Log message for revision 110082:
  Minor cleanups.
  

Changed:
  U   Sandbox/ulif/grokui.codebrowser/src/grokui/codebrowser/codebrowser.py

-=-
Modified: Sandbox/ulif/grokui.codebrowser/src/grokui/codebrowser/codebrowser.py
===================================================================
--- Sandbox/ulif/grokui.codebrowser/src/grokui/codebrowser/codebrowser.py	2010-03-19 23:25:43 UTC (rev 110081)
+++ Sandbox/ulif/grokui.codebrowser/src/grokui/codebrowser/codebrowser.py	2010-03-19 23:37:45 UTC (rev 110082)
@@ -2,7 +2,7 @@
 """
 import grok
 from grokui.base import IGrokUIRealm, GrokUIView
-from zope.component import getMultiAdapter
+from zope.component import queryMultiAdapter
 from zope.introspector.interfaces import IInfos
 from zope.location import LocationProxy
 from zope.session.interfaces import ISession
@@ -30,7 +30,6 @@
         return self
 
     def update(self, show_all=False, show_docs=False, update=None):
-
         session = ISession(self.request)['grokui.codebrowser']
         if update is None:
             show_all = session.get('show_all', False)
@@ -39,7 +38,6 @@
         self.show_docs = session['show_docs'] = show_docs
 
         self.path = '/'.join(self.url_path)
-        self.infos = []
         self.info_views = []
         if not self.url_path:
             self.url_path = ['code']
@@ -51,19 +49,16 @@
         result = []
         infos = IInfos(codeobj).infos()
         for name, info in infos:
-            view = None
-            try:
-                # We set the same location infos for the info
-                # object as for its context.
-                info = LocationProxy(
-                    info, codeobj.__parent__, codeobj.__name__
-                    )
-                result.append(
-                    getMultiAdapter((info, self.request), name='index')
-                    )
-            except:
-                # No view available for that info...
-                pass
+            # We set the same location infos for the info
+            # object as for its context.
+            info = LocationProxy(
+                info, codeobj.__parent__, codeobj.__name__
+                )
+            view = queryMultiAdapter(
+                (info, self.request), name='index', default=None)
+            if view is None:
+                continue
+            result.append(view)
         return result
 
     def traverseParts(self):
@@ -73,5 +68,5 @@
         return curr
 
     def getBreadCrumbs(self):
+        # XXX: Implement or remove.
         return ''
-



More information about the checkins mailing list