[Checkins] SVN: five.pt/trunk/src/five/pt/ Revert most of r117827, the container=aq_parent change. Other
Ross Patterson
me at rpatterson.net
Thu Nov 4 11:47:58 EDT 2010
Log message for revision 118207:
Revert most of r117827, the container=aq_parent change. Other
templates, such as Plone's prefs_install_products_form, expect
container to be the same as context, so the fix will have to go
elsewhere.
Changed:
U five.pt/trunk/src/five/pt/pagetemplate.py
U five.pt/trunk/src/five/pt/tests/locals.pt
U five.pt/trunk/src/five/pt/tests/test_viewpagetemplatefile.py
-=-
Modified: five.pt/trunk/src/five/pt/pagetemplate.py
===================================================================
--- five.pt/trunk/src/five/pt/pagetemplate.py 2010-11-04 15:26:25 UTC (rev 118206)
+++ five.pt/trunk/src/five/pt/pagetemplate.py 2010-11-04 15:47:57 UTC (rev 118207)
@@ -60,7 +60,7 @@
request=request or aq_get(instance, 'REQUEST', None),
template=self,
here=context,
- container=aq_parent(aq_inner(context)),
+ container=context,
nothing=None,
same_type=same_type,
test=test,
@@ -108,7 +108,7 @@
view=view,
template=self,
here=context,
- container=aq_parent(aq_inner(context)),
+ container=context,
nothing=None,
path=pagetemplate.evaluate_path,
exists=pagetemplate.evaluate_exists,
Modified: five.pt/trunk/src/five/pt/tests/locals.pt
===================================================================
--- five.pt/trunk/src/five/pt/tests/locals.pt 2010-11-04 15:26:25 UTC (rev 118206)
+++ five.pt/trunk/src/five/pt/tests/locals.pt 2010-11-04 15:47:57 UTC (rev 118207)
@@ -2,7 +2,7 @@
xmlns:tal="http://xml.zope.org/namespaces/tal">
<div tal:replace="string:view:${view/available}" />
<div tal:replace="python:'here==context:'+str(here==context)" />
- <div tal:replace="python:'parent==container:'+str(here.aq_parent==container)" />
+ <div tal:replace="python:'here==container:'+str(here==container)" />
<div tal:replace="string:root:${root/getPhysicalPath}" />
<div tal:replace="string:nothing:${nothing}" />
<div tal:define="cgi python:modules['cgi']">
Modified: five.pt/trunk/src/five/pt/tests/test_viewpagetemplatefile.py
===================================================================
--- five.pt/trunk/src/five/pt/tests/test_viewpagetemplatefile.py 2010-11-04 15:26:25 UTC (rev 118206)
+++ five.pt/trunk/src/five/pt/tests/test_viewpagetemplatefile.py 2010-11-04 15:47:57 UTC (rev 118207)
@@ -56,7 +56,7 @@
#self.failUnless('Folder at test_folder_1_' in result)
#self.failUnless('http://nohost' in result)
self.failUnless('here==context:True' in result)
- self.failUnless('parent==container:True' in result)
+ self.failUnless('here==container:True' in result)
self.failUnless("root:(\'\',)" in result)
self.failUnless("nothing:None" in result)
self.failUnless("modules:<foo>" in result)
More information about the checkins
mailing list