Log message for revision 122638:
Merge c122637 from 2.13 branch
Changed:
U Zope/trunk/src/OFS/Traversable.py
-=-
Modified: Zope/trunk/src/OFS/Traversable.py
===================================================================
--- Zope/trunk/src/OFS/Traversable.py 2011-08-20 16:33:37 UTC (rev 122637)
+++ Zope/trunk/src/OFS/Traversable.py 2011-08-20 16:34:11 UTC (rev 122638)
@@ -27,7 +27,6 @@
from Acquisition import aq_parent
from Acquisition.interfaces import IAcquirer
from OFS.interfaces import ITraversable, IApplication
-from webdav.NullResource import NullResource
from zExceptions import NotFound
from ZPublisher.interfaces import UseTraversalDefault
from ZODB.POSException import ConflictError
@@ -196,6 +195,8 @@
else:
obj = self
+ # import time ordering problem
+ from webdav.NullResource import NullResource
resource = _marker
try:
while path:
_______________________________________________
Zope-Checkins maillist - Zope-Checkins@zope.org
https://mail.zope.org/mailman/listinfo/zope-checkins
