[Zope-Checkins] CVS: Zope3/lib/python/Zope/PageTemplate - ViewZPT.py:1.1.2.5 ZPT.py:1.1.2.4

[Steve Alexander]

Update of /cvs-repository/Zope3/lib/python/Zope/PageTemplate
In directory cvs.zope.org:/tmp/cvs-serv17619/lib/python/Zope/PageTemplate

Modified Files:
      Tag: Zope-3x-branch
	ViewZPT.py ZPT.py 
Log Message:
Changed here -> context and container -> view
as described in http://collector.zope.org/Zope3-dev/43


=== Zope3/lib/python/Zope/PageTemplate/ViewZPT.py 1.1.2.4 => 1.1.2.5 ===
         namespace = ZPT.pt_getContext(self, instance, request, **keywords)
 
-        namespace['here'] = instance.getContext()
-        namespace['views'] = ViewMapper(namespace['here'],
+        namespace['context'] = instance.getContext()
+        namespace['views'] = ViewMapper(namespace['context'],
                                         namespace['request'])
         return namespace
 


=== Zope3/lib/python/Zope/PageTemplate/ZPT.py 1.1.2.3 => 1.1.2.4 ===
     def pt_getContext(self, instance, request, **keywords):
         namespace = PageTemplate.pt_getContext(self, **keywords)
-        namespace['container'] = getinnerwrapper(instance)
-        namespace['here'] = instance
+        namespace['view'] = getinnerwrapper(instance)
+        namespace['context'] = instance
         namespace['request'] = request
         return namespace