[Zope-Checkins] SVN: Zope/branches/2.13/src/OFS/Traversable.py Move NullResource to normal module scope import
Log message for revision 122634: Move NullResource to normal module scope import 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:11:34 UTC (rev 122633) +++ Zope/branches/2.13/src/OFS/Traversable.py 2011-08-20 16:21:56 UTC (rev 122634) @@ -27,6 +27,7 @@ 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 @@ -39,7 +40,6 @@ from zope.traversing.namespace import nsParse _marker = object() -NullResource = None class Traversable: @@ -254,10 +254,6 @@ # The item lookup may return a NullResource, # if this is the case we save it and return it # if all other lookups fail. -global NullResource -if NullResource is None: -from webdav.NullResource import NullResource - if isinstance(next, NullResource): resource = next raise KeyError(name) ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/2.13/src/OFS/Traversable.py Really revert all experimental changes to OFS.Traversable
Log message for revision 122635:
Really revert all experimental changes to OFS.Traversable
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:21:56 UTC (rev
122634)
+++ Zope/branches/2.13/src/OFS/Traversable.py 2011-08-20 16:26:13 UTC (rev
122635)
@@ -146,25 +146,26 @@
if not path:
return self
-if type(path) is str:
+if isinstance(path, str):
# Unicode paths are not allowed
path = path.split('/')
else:
path = list(path)
REQUEST = {'TraversalRequestNameStack': path}
+path.reverse()
path_pop = path.pop
-if not path[-1]:
+if len(path) 1 and not path[0]:
# Remove trailing slash
-path_pop()
+path_pop(0)
if restricted:
validate = getSecurityManager().validate
-if path and not path[0]:
+if not path[-1]:
# If the path starts with an empty string, go to the root first.
-path_pop(0)
+path_pop()
obj = self.getPhysicalRoot()
if restricted:
validate(None, None, None, obj) # may raise Unauthorized
@@ -173,7 +174,8 @@
resource = _marker
try:
-for name in path:
+while path:
+name = path_pop()
__traceback_info__ = path, name
if name[0] == '_':
___
Zope-Checkins maillist - Zope-Checkins@zope.org
https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/trunk/src/OFS/Traversable.py Merge c122634 from 2.13 branch
Log message for revision 122636: Merge c122634 from 2.13 branch Changed: U Zope/trunk/src/OFS/Traversable.py -=- Modified: Zope/trunk/src/OFS/Traversable.py === --- Zope/trunk/src/OFS/Traversable.py 2011-08-20 16:26:13 UTC (rev 122635) +++ Zope/trunk/src/OFS/Traversable.py 2011-08-20 16:28:37 UTC (rev 122636) @@ -27,6 +27,7 @@ from Acquisition import aq_parent from Acquisition.interfaces import IAcquirer from OFS.interfaces import ITraversable, IApplication +from webdav.NullResource import NullResource from zExceptions import NotFound from ZPublisher.interfaces import UseTraversalDefault from ZODB.POSException import ConflictError @@ -166,7 +167,6 @@ If true, then all of the objects along the path are validated with the security machinery. Usually invoked using restrictedTraverse(). -from webdav.NullResource import NullResource if not path: return self ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/2.13/src/OFS/Traversable.py Actually move NullResource back into the method scope, to avoid import ordering problems
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: ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/trunk/src/OFS/Traversable.py Merge c122637 from 2.13 branch
Log message for revision 122638: Merge c122637 from 2.13 branch Changed: U Zope/trunk/src/OFS/Traversable.py -=- Modified: Zope/trunk/src/OFS/Traversable.py === --- Zope/trunk/src/OFS/Traversable.py 2011-08-20 16:33:37 UTC (rev 122637) +++ Zope/trunk/src/OFS/Traversable.py 2011-08-20 16:34:11 UTC (rev 122638) @@ -27,7 +27,6 @@ from Acquisition import aq_parent from Acquisition.interfaces import IAcquirer from OFS.interfaces import ITraversable, IApplication -from webdav.NullResource import NullResource from zExceptions import NotFound from ZPublisher.interfaces import UseTraversalDefault from ZODB.POSException import ConflictError @@ -196,6 +195,8 @@ else: obj = self +# import time ordering problem +from webdav.NullResource import NullResource resource = _marker try: while path: ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/2.13/ New ZCatalog
Log message for revision 122642: New ZCatalog Changed: U Zope/branches/2.13/doc/CHANGES.rst U Zope/branches/2.13/versions.cfg -=- Modified: Zope/branches/2.13/doc/CHANGES.rst === --- Zope/branches/2.13/doc/CHANGES.rst 2011-08-20 16:35:42 UTC (rev 122641) +++ Zope/branches/2.13/doc/CHANGES.rst 2011-08-20 16:36:21 UTC (rev 122642) @@ -21,7 +21,7 @@ - Updated distributions: - - Products.ZCatalog = 2.13.18 + - Products.ZCatalog = 2.13.19 - Products.ZCTextIndex = 2.13.3 2.13.8 (2011-06-28) Modified: Zope/branches/2.13/versions.cfg === --- Zope/branches/2.13/versions.cfg 2011-08-20 16:35:42 UTC (rev 122641) +++ Zope/branches/2.13/versions.cfg 2011-08-20 16:36:21 UTC (rev 122642) @@ -22,7 +22,7 @@ Products.OFSP = 2.13.2 Products.PythonScripts = 2.13.0 Products.StandardCacheManagers = 2.13.0 -Products.ZCatalog = 2.13.18 +Products.ZCatalog = 2.13.19 Products.ZCTextIndex = 2.13.3 Record = 2.13.0 tempstorage = 2.12.1 ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/trunk/versions.cfg New ZCatalog
Log message for revision 122643: New ZCatalog Changed: U Zope/trunk/versions.cfg -=- Modified: Zope/trunk/versions.cfg === --- Zope/trunk/versions.cfg 2011-08-20 16:36:21 UTC (rev 122642) +++ Zope/trunk/versions.cfg 2011-08-20 16:37:46 UTC (rev 122643) @@ -16,7 +16,7 @@ nt-svcutils = 2.13.0 Persistence = 2.13.2 Products.OFSP = 2.13.2 -Products.ZCatalog = 2.13.18 +Products.ZCatalog = 2.13.19 Products.ZCTextIndex = 2.13.3 Record = 2.13.0 tempstorage = 2.12.1 ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/2.13/ Update to Zope Toolkit 1.0.4 and repoze.tm2 = 1.0b2
Log message for revision 122651: Update to Zope Toolkit 1.0.4 and repoze.tm2 = 1.0b2 Changed: U Zope/branches/2.13/doc/CHANGES.rst U Zope/branches/2.13/versions.cfg -=- Modified: Zope/branches/2.13/doc/CHANGES.rst === --- Zope/branches/2.13/doc/CHANGES.rst 2011-08-20 17:10:07 UTC (rev 122650) +++ Zope/branches/2.13/doc/CHANGES.rst 2011-08-20 17:12:47 UTC (rev 122651) @@ -23,6 +23,8 @@ - Products.ZCatalog = 2.13.19 - Products.ZCTextIndex = 2.13.3 + - repoze.tm2 = 1.0b2 + - Zope Toolkit 1.0.4 2.13.8 (2011-06-28) --- Modified: Zope/branches/2.13/versions.cfg === --- Zope/branches/2.13/versions.cfg 2011-08-20 17:10:07 UTC (rev 122650) +++ Zope/branches/2.13/versions.cfg 2011-08-20 17:12:47 UTC (rev 122651) @@ -1,5 +1,5 @@ [buildout] -extends = http://download.zope.org/zopetoolkit/index/1.0.3/ztk-versions.cfg +extends = http://download.zope.org/zopetoolkit/index/1.0.4/ztk-versions.cfg versions = versions [versions] @@ -39,6 +39,6 @@ # Zope2 dependencies repoze.retry = 1.0 -repoze.tm2 = 1.0b1 +repoze.tm2 = 1.0b2 repoze.who = 2.0b1 zope.testbrowser = 3.11.1 ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/2.13/ Prepare Zope2 2.13.9.
Log message for revision 122652: Prepare Zope2 2.13.9. Changed: U Zope/branches/2.13/doc/CHANGES.rst U Zope/branches/2.13/setup.py U Zope/branches/2.13/versions.cfg -=- Modified: Zope/branches/2.13/doc/CHANGES.rst === --- Zope/branches/2.13/doc/CHANGES.rst 2011-08-20 17:12:47 UTC (rev 122651) +++ Zope/branches/2.13/doc/CHANGES.rst 2011-08-20 17:16:44 UTC (rev 122652) @@ -5,7 +5,7 @@ Change information for previous versions of Zope can be found at http://docs.zope.org/zope2/releases/. -2.13.9 (unreleased) +2.13.9 (2011-08-20) --- Bugs Fixed @@ -14,11 +14,8 @@ - Restore ability to undo multiple transactions from the ZMI by using the `undoMultiple` API. Backported from trunk (r122087). -- Fixed chameleon compatibility in templates +- Fixed Chameleon compatibility in templates. -Features Added -++ - - Updated distributions: - Products.ZCatalog = 2.13.19 Modified: Zope/branches/2.13/setup.py === --- Zope/branches/2.13/setup.py 2011-08-20 17:12:47 UTC (rev 122651) +++ Zope/branches/2.13/setup.py 2011-08-20 17:16:44 UTC (rev 122652) @@ -23,7 +23,7 @@ setup(name='Zope2', -version='2.13.9dev', +version='2.13.9', url='http://zope2.zope.org', license='ZPL 2.1', description='Zope2 application server / web framework', Modified: Zope/branches/2.13/versions.cfg === --- Zope/branches/2.13/versions.cfg 2011-08-20 17:12:47 UTC (rev 122651) +++ Zope/branches/2.13/versions.cfg 2011-08-20 17:16:44 UTC (rev 122652) @@ -4,7 +4,7 @@ [versions] # Zope2-specific -Zope2 = +Zope2 = 2.13.9 AccessControl = 2.13.4 Acquisition = 2.13.8 DateTime = 2.12.6 ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/tags/2.13.9/ Tagged Zope2 2.13.9.
Log message for revision 122653: Tagged Zope2 2.13.9. Changed: A Zope/tags/2.13.9/ -=- ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/2.13/ vb
Log message for revision 122654: vb Changed: U Zope/branches/2.13/doc/CHANGES.rst U Zope/branches/2.13/setup.py U Zope/branches/2.13/versions.cfg -=- Modified: Zope/branches/2.13/doc/CHANGES.rst === --- Zope/branches/2.13/doc/CHANGES.rst 2011-08-20 17:16:58 UTC (rev 122653) +++ Zope/branches/2.13/doc/CHANGES.rst 2011-08-20 17:17:41 UTC (rev 122654) @@ -5,6 +5,13 @@ Change information for previous versions of Zope can be found at http://docs.zope.org/zope2/releases/. +2.13.10 (unreleased) + + +Bugs Fixed +++ + + 2.13.9 (2011-08-20) --- Modified: Zope/branches/2.13/setup.py === --- Zope/branches/2.13/setup.py 2011-08-20 17:16:58 UTC (rev 122653) +++ Zope/branches/2.13/setup.py 2011-08-20 17:17:41 UTC (rev 122654) @@ -23,7 +23,7 @@ setup(name='Zope2', -version='2.13.9', +version='2.13.10dev', url='http://zope2.zope.org', license='ZPL 2.1', description='Zope2 application server / web framework', Modified: Zope/branches/2.13/versions.cfg === --- Zope/branches/2.13/versions.cfg 2011-08-20 17:16:58 UTC (rev 122653) +++ Zope/branches/2.13/versions.cfg 2011-08-20 17:17:41 UTC (rev 122654) @@ -4,7 +4,7 @@ [versions] # Zope2-specific -Zope2 = 2.13.9 +Zope2 = AccessControl = 2.13.4 Acquisition = 2.13.8 DateTime = 2.12.6 ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
