[Zope3-checkins] CVS: Zope3/src/zope/app/publisher/browser - resources.py:1.9.24.2

[Jim Fulton]

Update of /cvs-repository/Zope3/src/zope/app/publisher/browser
In directory cvs.zope.org:/tmp/cvs-serv1977/src/zope/app/publisher/browser

Modified Files:
      Tag: parentgeddon-branch
	resources.py 
Log Message:
Got zope running with global principals

=== Zope3/src/zope/app/publisher/browser/resources.py 1.9.24.1 => 1.9.24.2 ===
--- Zope3/src/zope/app/publisher/browser/resources.py:1.9.24.1	Mon Sep  8 14:21:45 2003
+++ Zope3/src/zope/app/publisher/browser/resources.py	Thu Sep 11 06:31:31 2003
@@ -23,6 +23,7 @@
 from zope.app.services.servicenames import Resources as ResourceService
 from zope.exceptions import NotFoundError
 from zope.interface import implements
+from zope.app.location import locate
 
 class Resources(BrowserView):
     """Provide a URL-accessible resource namespace
@@ -30,16 +31,15 @@
 
     implements(IBrowserPublisher)
 
-    def publishTraverse(wrapped_self, request, name):
+    def publishTraverse(self, request, name):
         '''See interface IBrowserPublisher'''
 
-        resource_service = getService(wrapped_self, ResourceService)
-        resource = resource_service.queryResource(wrapped_self, name, request)
+        resource_service = getService(self, ResourceService)
+        resource = resource_service.queryResource(self, name, request)
         if resource is None:
-            raise NotFoundError(wrapped_self, name)
+            raise NotFoundError(self, name)
 
-        resource.__parent__ = resource_service
-        resource.__name__ = name
+        locate(resource, resource_service, name)
         return resource
 
     def browserDefault(self, request):