Commit 63ac97bf authored by Andreas Jung's avatar Andreas Jung

reverted last checkin (breaking tests)

parent 349752cd
...@@ -23,9 +23,6 @@ Restructuring ...@@ -23,9 +23,6 @@ Restructuring
Features Added Features Added
++++++++++++++ ++++++++++++++
- Launchpad #373658: traversal using (un)restrictedTraverse
no longer depends no the existence of a request
- Launchpad #373583: ZODBMountPoint - fixed broken mount support and - Launchpad #373583: ZODBMountPoint - fixed broken mount support and
extended the test suite. extended the test suite.
......
...@@ -154,7 +154,6 @@ class Traversable: ...@@ -154,7 +154,6 @@ class Traversable:
path = list(path) path = list(path)
REQUEST = {'TraversalRequestNameStack': path} REQUEST = {'TraversalRequestNameStack': path}
web_request = getattr(self, 'REQUEST', None)
path.reverse() path.reverse()
path_pop = path.pop path_pop = path.pop
...@@ -199,7 +198,7 @@ class Traversable: ...@@ -199,7 +198,7 @@ class Traversable:
ns, nm = nsParse(name) ns, nm = nsParse(name)
try: try:
next = namespaceLookup( next = namespaceLookup(
ns, nm, obj, web_request).__of__(obj) ns, nm, obj, aq_acquire(self, 'REQUEST'))
if IAcquirer.providedBy(next): if IAcquirer.providedBy(next):
next = next.__of__(obj) next = next.__of__(obj)
if restricted and not validate( if restricted and not validate(
...@@ -265,7 +264,7 @@ class Traversable: ...@@ -265,7 +264,7 @@ class Traversable:
except (AttributeError, NotFound, KeyError), e: except (AttributeError, NotFound, KeyError), e:
# Try to look for a view # Try to look for a view
next = queryMultiAdapter((obj, web_request), next = queryMultiAdapter((obj, aq_acquire(self, 'REQUEST')),
Interface, name) Interface, name)
if next is not None: if next is not None:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment