[Zope3-checkins] SVN: Zope3/branches/ZopeX3-3.0/src/zope/app/a Backported

[Stephan Richter]

Log message for revision 27083:
  Backported
  
  r26575 | srichter | 2004-07-16 07:22:32 -0400 (Fri, 16 Jul 2004) | 4 lines
  r26576 | srichter | 2004-07-16 07:50:16 -0400 (Fri, 16 Jul 2004) | 2 lines
  r26577 | srichter | 2004-07-16 07:50:57 -0400 (Fri, 16 Jul 2004) | 3 lines
  r26578 | srichter | 2004-07-16 08:13:13 -0400 (Fri, 16 Jul 2004) | 5 lines
  r26579 | srichter | 2004-07-16 08:33:24 -0400 (Fri, 16 Jul 2004) | 3 lines
  
  


Changed:
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/adapter/adapter.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/classmodule/__init__.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/utilitymodule/__init__.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/viewmodule/index.pt
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/zcmlmodule/__init__.py


-=-
Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/adapter/adapter.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/adapter/adapter.py	2004-08-12 20:03:58 UTC (rev 27082)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/adapter/adapter.py	2004-08-12 20:06:47 UTC (rev 27083)
@@ -267,7 +267,7 @@
         for registration in LocalAdapterRegistry.registrations(self):
             yield registration
 
-        if localOnly is True:
+        if localOnly:
             return
 
         next = self.next

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/classmodule/__init__.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/classmodule/__init__.py	2004-08-12 20:03:58 UTC (rev 27082)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/classmodule/__init__.py	2004-08-12 20:06:47 UTC (rev 27083)
@@ -226,7 +226,8 @@
             if hasattr(attr, '__module__') and \
                    attr.__module__ == self.__module.__name__:
 
-                if type(attr) in (ClassType, TypeType):
+                if type(attr) in (ClassType, TypeType) and \
+                       attr.__name__ == name:
                     self.__children[attr.__name__] = Class(self, name, attr)
 
                 elif type(attr) is FunctionType and not name.startswith('_'):

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/utilitymodule/__init__.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/utilitymodule/__init__.py	2004-08-12 20:03:58 UTC (rev 27082)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/utilitymodule/__init__.py	2004-08-12 20:06:47 UTC (rev 27083)
@@ -93,14 +93,9 @@
     def items(self):
         """See zope.app.container.interfaces.IReadContainer"""
         service = zapi.getService(Utilities)
-        items = []
-
-        while service is not None:
-            items += [(reg.name or NONAME, Utility(self, reg))
-                      for reg in service.registrations()
-                      if self.interface == reg.provided]
-            service = queryNextService(service, Utilities)
-
+        items = [(reg.name or NONAME, Utility(self, reg))
+                 for reg in service.registrations()
+                 if self.interface == reg.provided]
         items.sort()
         return items
 

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/viewmodule/index.pt
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/viewmodule/index.pt	2004-08-12 20:03:58 UTC (rev 27082)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/viewmodule/index.pt	2004-08-12 20:06:47 UTC (rev 27083)
@@ -73,10 +73,9 @@
             <br />
           </tal:omit-tag>
           <span 
-              tal:condition="python: View['read_perm'] and View['write_perm']">
-            <i i18n:translate="">Permissions:</i>
-            <span tal:replace="View/read_perm">zope.View</span> (read), 
-            <span tal:replace="View/write_perm">zope.View</span> (write)
+              tal:condition="View/read_perm">
+            <i i18n:translate="">Permission:</i>
+            <span tal:replace="View/read_perm">zope.View</span>
           </span>
         </span></div>
         <br />

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/zcmlmodule/__init__.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/zcmlmodule/__init__.py	2004-08-12 20:03:58 UTC (rev 27082)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/zcmlmodule/__init__.py	2004-08-12 20:06:47 UTC (rev 27083)
@@ -112,10 +112,7 @@
 
     def getFullName(self):
         """Get the full name of the namespace."""
-        name = self.__realname__
-        if name != 'ALL' and not name.startswith('http://namespaces.zope.org/'):
-            name = 'http://namespaces.zope.org/' + name
-        return name
+        return self.__realname__
 
     def getQuotedName(self):
         """Get the full name, but quoted for a URL."""
@@ -232,13 +229,16 @@
             self._makeDocStructure()
 
         key = unquoteNS(key)
-        if not (key == 'ALL' or key.startswith('http://namespaces.zope.org/')):
-            key = 'http://namespaces.zope.org/' + key
-        if not namespaces.has_key(key):
-            return default
-        return Namespace(self, key)
+        if namespaces.has_key(key):
+            return Namespace(self, key)
 
+        full_key = 'http://namespaces.zope.org/' + key
+        if namespaces.has_key(full_key):
+            return Namespace(self, full_key)        
+        
+        return default
 
+
     def items(self):
         """See zope.app.container.interfaces.IReadContainer"""
         if namespaces is None or subdirs is None: