Commit b13e20b1 authored by Hanno Schlichting's avatar Hanno Schlichting

Merge c122637 from 2.13 branch

parent c1bfc11b
...@@ -27,7 +27,6 @@ from Acquisition import aq_inner ...@@ -27,7 +27,6 @@ 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
...@@ -196,6 +195,8 @@ class Traversable: ...@@ -196,6 +195,8 @@ class Traversable:
else: else:
obj = self obj = self
# import time ordering problem
from webdav.NullResource import NullResource
resource = _marker resource = _marker
try: try:
while path: while path:
......
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