[ZPT] CVS: Zope/lib/python/Products/PageTemplates - Expressions.py:1.36.4.1 PageTemplate.py:1.25.4.2 PageTemplateFile.py:1.19.4.2 ZopePageTemplate.py:1.42.4.3

[Chris McDonough]

Update of /cvs-repository/Zope/lib/python/Products/PageTemplates
In directory cvs.zope.org:/tmp/cvs-serv9237/lib/python/Products/PageTemplates

Modified Files:
      Tag: chrism-install-branch
	Expressions.py PageTemplate.py PageTemplateFile.py 
	ZopePageTemplate.py 
Log Message:
Merging with HEAD.


=== Zope/lib/python/Products/PageTemplates/Expressions.py 1.36 => 1.36.4.1 ===
--- Zope/lib/python/Products/PageTemplates/Expressions.py:1.36	Wed Aug 14 18:17:24 2002
+++ Zope/lib/python/Products/PageTemplates/Expressions.py	Mon Sep 16 02:00:51 2002
@@ -315,7 +315,11 @@
             o=t(REQUEST, name)
 
             container = None
-            if has(o, 'im_self'):
+            if aq_base(o) is not o:
+                # The object is wrapped, so the acquisition
+                # context determines the container.
+                container = aq_parent(aq_inner(o))
+            elif has(o, 'im_self'):
                 container = o.im_self
             elif (has(get(object, 'aq_base', object), name)
                 and get(object, name) == o):


=== Zope/lib/python/Products/PageTemplates/PageTemplate.py 1.25.4.1 => 1.25.4.2 ===


=== Zope/lib/python/Products/PageTemplates/PageTemplateFile.py 1.19.4.1 => 1.19.4.2 ===


=== Zope/lib/python/Products/PageTemplates/ZopePageTemplate.py 1.42.4.2 => 1.42.4.3 ===