[Checkins] SVN: Zope/branches/haufe-legacy-integration/ reverted last checkin (breaking tests)

[Andreas Jung]

Log message for revision 99831:
  reverted last checkin (breaking tests) 
  

Changed:
  U   Zope/branches/haufe-legacy-integration/doc/CHANGES.rst
  U   Zope/branches/haufe-legacy-integration/src/OFS/Traversable.py

-=-
Modified: Zope/branches/haufe-legacy-integration/doc/CHANGES.rst
===================================================================
--- Zope/branches/haufe-legacy-integration/doc/CHANGES.rst	2009-05-10 23:52:35 UTC (rev 99830)
+++ Zope/branches/haufe-legacy-integration/doc/CHANGES.rst	2009-05-11 04:25:37 UTC (rev 99831)
@@ -23,9 +23,6 @@
 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 
   extended the test suite.
 

Modified: Zope/branches/haufe-legacy-integration/src/OFS/Traversable.py
===================================================================
--- Zope/branches/haufe-legacy-integration/src/OFS/Traversable.py	2009-05-10 23:52:35 UTC (rev 99830)
+++ Zope/branches/haufe-legacy-integration/src/OFS/Traversable.py	2009-05-11 04:25:37 UTC (rev 99831)
@@ -154,7 +154,6 @@
             path = list(path)
 
         REQUEST = {'TraversalRequestNameStack': path}
-        web_request = getattr(self, 'REQUEST', None)
         path.reverse()
         path_pop = path.pop
 
@@ -199,7 +198,7 @@
                         ns, nm = nsParse(name)
                         try:
                             next = namespaceLookup(
-                                ns, nm, obj, web_request).__of__(obj)
+                                ns, nm, obj, aq_acquire(self, 'REQUEST'))
                             if IAcquirer.providedBy(next):
                                 next = next.__of__(obj)
                             if restricted and not validate(
@@ -265,7 +264,7 @@
 
                 except (AttributeError, NotFound, KeyError), e:
                     # Try to look for a view
-                    next = queryMultiAdapter((obj, web_request),
+                    next = queryMultiAdapter((obj, aq_acquire(self, 'REQUEST')),
                                              Interface, name)
 
                     if next is not None: