[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/ZopePublication/TraversalViews - AbsoluteURL.py:1.2 ObjectName.py:1.3

[Jim Fulton]

Update of /cvs-repository/Zope3/lib/python/Zope/App/ZopePublication/TraversalViews
In directory cvs.zope.org:/tmp/cvs-serv7355/lib/python/Zope/App/ZopePublication/TraversalViews

Modified Files:
	AbsoluteURL.py ObjectName.py 
Log Message:

Reimplemented service managers to be package based. Service managers
are no longer containers. They have a packages subobject (not a
packages service) that contains packages. TTW components are created
in packages. To register a component, create the appropriate component
directive objects (these should be called configuration objects).

This should be viewed as a prototype to illustrate the idea of
packages. Lots of things can change (especially UI) and many things
aren't done (e.g. visiting created directives).

In the course of this, I fixed a bunch of bugs and problems in
traversal machinery. 

I also renamed Zope.ComponentArchitecture.IServiceManager back to
IServiceService, since this interface doesn't actually specify any
management.  



=== Zope3/lib/python/Zope/App/ZopePublication/TraversalViews/AbsoluteURL.py 1.1 => 1.2 ===
 $Id$
 """
 from Zope.Publisher.Browser.BrowserView import BrowserView
-from Zope.Proxy.ContextWrapper import getWrapperContainer, getWrapperData
+from Zope.Proxy.ContextWrapper import getWrapperContainer, getInnerWrapperData
 from Zope.ComponentArchitecture import getView
 
 from Interface import Interface
@@ -40,7 +40,7 @@
 
     def __str__(self):
         context = self.context
-        dict = getWrapperData(context)
+        dict = getInnerWrapperData(context)
         name = dict and dict.get('name') or None
         container = getWrapperContainer(context)
         if name is None or container is None:


=== Zope3/lib/python/Zope/App/ZopePublication/TraversalViews/ObjectName.py 1.2 => 1.3 ===
 $Id$
 """
 from Zope.Publisher.Browser.IBrowserView import IBrowserView
-from Zope.Proxy.ContextWrapper import getWrapperData
+from Zope.Proxy.ContextWrapper import getInnerWrapperData
 from Zope.App.Traversing.ObjectName \
     import IObjectName, ObjectName, SiteObjectName