Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Z
Zope
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
Zope
Commits
ecd32892
Commit
ecd32892
authored
Aug 20, 2011
by
Hanno Schlichting
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move NullResource to normal module scope import
parent
995ffadc
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
5 deletions
+1
-5
src/OFS/Traversable.py
src/OFS/Traversable.py
+1
-5
No files found.
src/OFS/Traversable.py
View file @
ecd32892
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment