[Zope-Checkins] SVN: Zope/branches/2.13/src/OFS/Traversable.py Actually move NullResource back into the method scope, to avoid import ordering problems

Hanno Schlichting hannosch at hannosch.eu
Sat Aug 20 12:33:38 EDT 2011


Log message for revision 122637:
  Actually move NullResource back into the method scope, to avoid import ordering problems
  

Changed:
  U   Zope/branches/2.13/src/OFS/Traversable.py

-=-
Modified: Zope/branches/2.13/src/OFS/Traversable.py
===================================================================
--- Zope/branches/2.13/src/OFS/Traversable.py	2011-08-20 16:28:37 UTC (rev 122636)
+++ Zope/branches/2.13/src/OFS/Traversable.py	2011-08-20 16:33:37 UTC (rev 122637)
@@ -27,7 +27,6 @@
 from Acquisition import aq_parent
 from Acquisition.interfaces import IAcquirer
 from OFS.interfaces import ITraversable
-from webdav.NullResource import NullResource
 from zExceptions import NotFound
 from ZPublisher.interfaces import UseTraversalDefault
 from ZODB.POSException import ConflictError
@@ -172,6 +171,8 @@
         else:
             obj = self
 
+        # import time ordering problem
+        from webdav.NullResource import NullResource
         resource = _marker
         try:
             while path:



More information about the Zope-Checkins mailing list