[Zope-Checkins] SVN: Zope/trunk/src/OFS/Traversable.py Merge c122634 from 2.13 branch
Hanno Schlichting
hannosch at hannosch.eu
Sat Aug 20 12:28:37 EDT 2011
Log message for revision 122636:
Merge c122634 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:26:13 UTC (rev 122635)
+++ Zope/trunk/src/OFS/Traversable.py 2011-08-20 16:28:37 UTC (rev 122636)
@@ -27,6 +27,7 @@
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
@@ -166,7 +167,6 @@
If true, then all of the objects along the path are validated with
the security machinery. Usually invoked using restrictedTraverse().
"""
- from webdav.NullResource import NullResource
if not path:
return self
More information about the Zope-Checkins
mailing list