Commit ecd32892 authored by Hanno Schlichting's avatar Hanno Schlichting

Move NullResource to normal module scope import

parent 995ffadc
...@@ -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 from OFS.interfaces import ITraversable
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
...@@ -39,7 +40,6 @@ from zope.traversing.namespace import namespaceLookup ...@@ -39,7 +40,6 @@ from zope.traversing.namespace import namespaceLookup
from zope.traversing.namespace import nsParse from zope.traversing.namespace import nsParse
_marker = object() _marker = object()
NullResource = None
class Traversable: class Traversable:
...@@ -254,10 +254,6 @@ class Traversable: ...@@ -254,10 +254,6 @@ class Traversable:
# The item lookup may return a NullResource, # The item lookup may return a NullResource,
# if this is the case we save it and return it # if this is the case we save it and return it
# if all other lookups fail. # if all other lookups fail.
global NullResource
if NullResource is None:
from webdav.NullResource import NullResource
if isinstance(next, NullResource): if isinstance(next, NullResource):
resource = next resource = next
raise KeyError(name) raise KeyError(name)
......
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