Commit c1bfc11b authored by Hanno Schlichting's avatar Hanno Schlichting

Merge c122634 from 2.13 branch

parent 0398f243
...@@ -27,6 +27,7 @@ from Acquisition import aq_inner ...@@ -27,6 +27,7 @@ from Acquisition import aq_inner
from Acquisition import aq_parent from Acquisition import aq_parent
from Acquisition.interfaces import IAcquirer from Acquisition.interfaces import IAcquirer
from OFS.interfaces import ITraversable, IApplication from OFS.interfaces import ITraversable, IApplication
from webdav.NullResource import NullResource
from zExceptions import NotFound from zExceptions import NotFound
from ZPublisher.interfaces import UseTraversalDefault from ZPublisher.interfaces import UseTraversalDefault
from ZODB.POSException import ConflictError from ZODB.POSException import ConflictError
...@@ -166,7 +167,6 @@ class Traversable: ...@@ -166,7 +167,6 @@ class Traversable:
If true, then all of the objects along the path are validated with If true, then all of the objects along the path are validated with
the security machinery. Usually invoked using restrictedTraverse(). the security machinery. Usually invoked using restrictedTraverse().
""" """
from webdav.NullResource import NullResource
if not path: if not path:
return self return self
......
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