Provide econtext to the zope traverser instead of just request.

zopefoundation · Jan 6, 2012 · 1ca2fe1 · 1ca2fe1
1 parent 228d0b7
commit 1ca2fe1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+In next release ...
+
+- The ``ZopeTraverser`` class now gets ``econtext`` instead of the
+  name ``request``.
+
 2.1.5 (2011-11-24)
 ~~~~~~~~~~~~~~~~~~
 

diff --git a/src/z3c/pt/expressions.py b/src/z3c/pt/expressions.py
@@ -53,10 +53,11 @@ class ZopeTraverser(object):
     def __init__(self, proxify=identity):
         self.proxify = proxify
 
-    def __call__(self, base, request, call, *path_items):
+    def __call__(self, base, econtext, call, *path_items):
         """See ``zope.app.pagetemplate.engine``."""
 
         if bool(path_items):
+            request = econtext.get('request')
             path_items = list(path_items)
             path_items.reverse()
 
@@ -165,7 +166,7 @@ def replace(match):
                 components = ()
 
         call = template(
-            "traverse(base, request, call)",
+            "traverse(base, econtext, call)",
             traverse=self.traverser,
             base=load(base),
             call=load(str(not nocall)),