[Zope3-checkins] CVS: Zope3/src/zope/app/apidoc/viewmodule - browser.py:1.11

[Stephan Richter]

Update of /cvs-repository/Zope3/src/zope/app/apidoc/viewmodule
In directory cvs.zope.org:/tmp/cvs-serv30019/src/zope/app/apidoc/viewmodule

Modified Files:
	browser.py 
Log Message:


The simple proxyView function simply did not handle multi-views
correctly. Shrug. Took me 3 hours to find this bug. I replaced the function
with a class that does the right thing and updated the API doc tool to
recognize it as well.




=== Zope3/src/zope/app/apidoc/viewmodule/browser.py 1.10 => 1.11 ===
--- Zope3/src/zope/app/apidoc/viewmodule/browser.py:1.10	Thu Apr 15 09:24:39 2004
+++ Zope3/src/zope/app/apidoc/viewmodule/browser.py	Sat Apr 24 19:19:27 2004
@@ -170,9 +170,9 @@
     elif factory.__module__.startswith('zope.app.publisher.browser.viewmeta'):
         info['path'] = getPythonPath(factory.__bases__[0])
 
-    elif hasattr(factory, '__name__') and factory.__name__ == 'proxyView':
-        if hasattr(factory, 'factory'):
-            factory = factory.factory
+    elif hasattr(factory, '__class__') and \
+             factory.__class__.__name__ == 'ProxyView':
+        factory = factory.factory
         info['path'] = factory.__module__ + '.' + factory.__name__
 
     elif not hasattr(factory, '__name__'):