[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/Publisher/Browser - Resource.py:1.2

[Jim Fulton]

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

Modified Files:
	Resource.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/Publisher/Browser/Resource.py 1.1 => 1.2 ===
 __metaclass__ = type # All classes are new style when run with Python 2.2+
 
 from Zope.ComponentArchitecture import queryView
-from Zope.Proxy.ContextWrapper import getWrapperContainer, getWrapperData
+from Zope.Proxy.ContextWrapper import getWrapperContainer, getInnerWrapperData
 from Zope.ContextWrapper import ContextMethod
 
 class Resource:
@@ -27,7 +27,7 @@
         self.request = request
 
     def __call__(self):
-        name = getWrapperData(self)['name']
+        name = getInnerWrapperData(self)['name']
         if name.startswith('++resource++'):
             name = name[12:]