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

Steve Alexander steve@cat-box.net
Mon, 28 Oct 2002 06:47:21 -0500


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

Modified Files:
	Resource.py 
Log Message:
Changed self to wrapped_self to reflect its nature as a ContextMethod


=== Zope3/lib/python/Zope/App/Publisher/Browser/Resource.py 1.3 => 1.4 ===
--- Zope3/lib/python/Zope/App/Publisher/Browser/Resource.py:1.3	Fri Jul 12 18:11:03 2002
+++ Zope3/lib/python/Zope/App/Publisher/Browser/Resource.py	Mon Oct 28 06:47:21 2002
@@ -26,22 +26,24 @@
     def __init__(self, request):
         self.request = request
 
-    def __call__(self):
-        name = getInnerWrapperData(self)['name']
+    def __call__(wrapped_self):
+        name = getInnerWrapperData(wrapped_self)['name']
         if name.startswith('++resource++'):
             name = name[12:]
 
-        service = getWrapperContainer(self)
+        service = getWrapperContainer(wrapped_self)
         site = getWrapperContainer(service)
 
-        skin = self.request.getPresentationSkin()
+        skin = wrapped_self.request.getPresentationSkin()
         if skin:
             skin = "++skin++%s/" % skin
 
         if site is None:
             return "/%s@@/%s" % (skin, name)
 
-        absolute_url = queryView(service, 'absolute_url', self.request)
+        absolute_url = queryView(service,
+                                 'absolute_url',
+                                 wrapped_self.request)
 
         if absolute_url is None:
             return "/%s@@/%s" % (skin, name)