[Checkins] SVN: zope.app.apidoc/trunk/s Fix compatibility with newer zope.traversing and zope.location and

[Christian Theune]

Log message for revision 95433:
  Fix compatibility with newer zope.traversing and zope.location and
  document dependencies.
  

Changed:
  U   zope.app.apidoc/trunk/setup.py
  U   zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/introspector.txt
  U   zope.app.apidoc/trunk/src/zope/app/apidoc/ftesting-base.zcml
  U   zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/browser.txt
  U   zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/ifacemodule.py

-=-
Modified: zope.app.apidoc/trunk/setup.py
===================================================================
--- zope.app.apidoc/trunk/setup.py	2009-01-29 13:37:56 UTC (rev 95432)
+++ zope.app.apidoc/trunk/setup.py	2009-01-29 13:49:17 UTC (rev 95433)
@@ -71,7 +71,7 @@
         'zope.app.appsetup',
         'zope.app.basicskin',
         'zope.app.component',
-        'zope.app.container',
+        'zope.app.container>=3.7dev',
         'zope.app.onlinehelp',
         'zope.app.preference',
         'zope.app.publisher',
@@ -91,7 +91,7 @@
         'zope.security',
         'zope.testbrowser',
         'zope.testing',
-        'zope.traversing',
+        'zope.traversing>=3.5a5dev',
         ],
       extras_require = dict(
           test=['zope.app.testing',

Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/introspector.txt
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/introspector.txt	2009-01-29 13:37:56 UTC (rev 95432)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/introspector.txt	2009-01-29 13:49:17 UTC (rev 95433)
@@ -51,8 +51,8 @@
     >>> browser.getLink('zope.location.interfaces.IPossibleSite').url
     '.../Interface/zope.location.interfaces.IPossibleSite/index.html'
 
-    >>> browser.getLink('zope.app.container.interfaces.IContained').url
-    '...doc++/Interface/zope.app.container.interfaces.IContained/index.html'
+    >>> browser.getLink('zope.container.interfaces.IContained').url
+    '...doc++/Interface/zope.container.interfaces.IContained/index.html'
 
 The base classes of the ``Folder`` are as follows:
 
@@ -62,8 +62,8 @@
     >>> browser.getLink('zope.app.component.site.SiteManagerContainer').url
     '...apidoc++/Code/zope/app/component/site/SiteManagerContainer/index.html'
 
-    >>> browser.getLink('zope.app.container.contained.Contained').url
-    '.../++apidoc++/Code/zope/app/container/contained/Contained/index.html'
+    >>> browser.getLink('zope.container.contained.Contained').url
+    '.../++apidoc++/Code/zope/container/contained/Contained/index.html'
 
 Now that we described the component and class level of the object, the view
 dives into some details. First it lists the attributes/properties of the
@@ -159,7 +159,7 @@
             <code>&lt;zope.app.file.file.File object at ...&gt;</code>
           </a>
           (<span>type:</span>
-           <a href="...zope/app/container/contained/ContainedProxy/index.html">
+           <a href="...zope/container/contained/ContainedProxy/index.html">
             <code>ContainedProxy</code></a>)
         </li>
       </ul>

Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/ftesting-base.zcml
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/ftesting-base.zcml	2009-01-29 13:37:56 UTC (rev 95432)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/ftesting-base.zcml	2009-01-29 13:49:17 UTC (rev 95433)
@@ -19,6 +19,7 @@
   <include package="zope.app.tree"/>
   <include package="zope.app.authentication" />
   <include package="zope.app.securitypolicy" />
+  <include package="zope.location" />
 
   <securityPolicy
     component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy" />

Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/browser.txt
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/browser.txt	2009-01-29 13:37:56 UTC (rev 95432)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/browser.txt	2009-01-29 13:49:17 UTC (rev 95433)
@@ -316,8 +316,8 @@
     'factory': 'zope.location.traversing.LocationPhysicallyLocatable',
     'factory_url': 'zope/location/traversing/LocationPhysicallyLocatable',
     'name': u'',
-    'provided': {'module': 'zope.traversing.interfaces',
-                 'name': 'IPhysicallyLocatable'},
+    'provided': {'module': 'zope.location.interfaces',
+                 'name': 'ILocationInfo'},
     'required': [{'isInterface': True,
                   'isType': False,
                   'module': 'zope.interface',
@@ -338,7 +338,7 @@
     'factory': 'zope.traversing.adapters.Traverser',
     'factory_url': 'zope/traversing/adapters/Traverser',
     'name': u'',
-    'provided': {'module': 'zope.traversing.interfaces',
+    'provided': {'module': 'zope.location.interfaces',
                  'name': 'ITraverser'},
     'required': [{'isInterface': True,
                   'isType': False,

Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/ifacemodule.py
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/ifacemodule.py	2009-01-29 13:37:56 UTC (rev 95432)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/ifacemodule.py	2009-01-29 13:49:17 UTC (rev 95433)
@@ -27,6 +27,7 @@
 from zope.i18nmessageid import ZopeMessageFactory as _
 from zope.interface import implements
 from zope.location import LocationProxy
+from zope.location.interfaces import ILocation
 
 from zope.app.apidoc.interfaces import IDocumentationModule
 from zope.app.apidoc.utilities import ReadContainerBase
@@ -45,8 +46,11 @@
     items of the container are all the interfaces listed in the global
     site manager."""
 
-    implements(IInterfaceModule)
+    implements(ILocation, IInterfaceModule)
 
+    __name__ = None
+    __parent__ = None
+
     # See zope.app.apidoc.interfaces.IDocumentationModule
     title = _('Interfaces')