[Zope-Checkins] SVN: Zope/branches/2.13/ Products.ZCatalog = 2.13.23
Log message for revision 125302: Products.ZCatalog = 2.13.23 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 2012-04-26 00:43:00 UTC (rev 125301) +++ Zope/branches/2.13/doc/CHANGES.rst 2012-04-26 00:49:43 UTC (rev 125302) @@ -10,6 +10,10 @@ - ZPublisher: Fixed a traversal regression introduced in 2.13.12. +- Updated distributions: + + - Products.ZCatalog = 2.13.23 + 2.13.13 (2012-02-20) Modified: Zope/branches/2.13/versions.cfg === --- Zope/branches/2.13/versions.cfg 2012-04-26 00:43:00 UTC (rev 125301) +++ Zope/branches/2.13/versions.cfg 2012-04-26 00:49:43 UTC (rev 125302) @@ -22,7 +22,7 @@ Products.OFSP = 2.13.2 Products.PythonScripts = 2.13.0 Products.StandardCacheManagers = 2.13.0 -Products.ZCatalog = 2.13.22 +Products.ZCatalog = 2.13.23 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/ Products.ZCatalog = 3.0a2
Log message for revision 125303: Products.ZCatalog = 3.0a2 Changed: U Zope/trunk/doc/CHANGES.rst U Zope/trunk/versions.cfg -=- Modified: Zope/trunk/doc/CHANGES.rst === --- Zope/trunk/doc/CHANGES.rst 2012-04-26 00:49:43 UTC (rev 125302) +++ Zope/trunk/doc/CHANGES.rst 2012-04-26 00:50:50 UTC (rev 125303) @@ -65,6 +65,7 @@ - DateTime = 3.0 - docutils = 0.8.1 - manuel = 1.5.0 + - Products.ZCatalog = 3.0a2 Restructuring + Modified: Zope/trunk/versions.cfg === --- Zope/trunk/versions.cfg 2012-04-26 00:49:43 UTC (rev 125302) +++ Zope/trunk/versions.cfg 2012-04-26 00:50:50 UTC (rev 125303) @@ -16,7 +16,7 @@ nt-svcutils = 2.13.0 Persistence = 2.13.2 Products.OFSP = 2.13.2 -Products.ZCatalog = 2.13.22 +Products.ZCatalog = 3.0a2 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/ some new versions
Log message for revision 126405: some new versions Changed: U Zope/trunk/doc/CHANGES.rst U Zope/trunk/versions.cfg -=- Modified: Zope/trunk/doc/CHANGES.rst === --- Zope/trunk/doc/CHANGES.rst 2012-05-20 15:19:06 UTC (rev 126404) +++ Zope/trunk/doc/CHANGES.rst 2012-05-20 15:26:10 UTC (rev 126405) @@ -62,7 +62,10 @@ - Updated distributions: + - AccessControl = 3.0 + - Acquisition = 4.0a1 - DateTime = 3.0 + - ExtensionClass = 4.0a1 - docutils = 0.8.1 - manuel = 1.5.0 - Products.ZCatalog = 3.0a2 Modified: Zope/trunk/versions.cfg === --- Zope/trunk/versions.cfg 2012-05-20 15:19:06 UTC (rev 126404) +++ Zope/trunk/versions.cfg 2012-05-20 15:26:10 UTC (rev 126405) @@ -5,11 +5,11 @@ [versions] # Zope2-specific Zope2 = -AccessControl = 2.13.7 -Acquisition = 2.13.8 +AccessControl = 3.0 +Acquisition = 4.0a1 DateTime = 3.0 DocumentTemplate = 2.13.2 -ExtensionClass = 2.13.2 +ExtensionClass = 4.0a1 initgroups = 2.13.0 Missing = 2.13.1 MultiMapping = 2.13.0 ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/trunk/ update to AC 3.0.1
Log message for revision 126485: update to AC 3.0.1 Changed: U Zope/trunk/doc/CHANGES.rst U Zope/trunk/versions.cfg -=- Modified: Zope/trunk/doc/CHANGES.rst === --- Zope/trunk/doc/CHANGES.rst 2012-05-24 14:33:27 UTC (rev 126484) +++ Zope/trunk/doc/CHANGES.rst 2012-05-24 14:34:07 UTC (rev 126485) @@ -62,7 +62,7 @@ - Updated distributions: - - AccessControl = 3.0 + - AccessControl = 3.0.1 - Acquisition = 4.0a1 - DateTime = 3.0 - ExtensionClass = 4.0a1 Modified: Zope/trunk/versions.cfg === --- Zope/trunk/versions.cfg 2012-05-24 14:33:27 UTC (rev 126484) +++ Zope/trunk/versions.cfg 2012-05-24 14:34:07 UTC (rev 126485) @@ -5,7 +5,7 @@ [versions] # Zope2-specific Zope2 = -AccessControl = 3.0 +AccessControl = 3.0.1 Acquisition = 4.0a1 DateTime = 3.0 DocumentTemplate = 2.13.2 ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/2.13/ Added PubStart, PubBeforeCommit and PubAfterTraversal events to the WSGI publisher.
Log message for revision 126486: Added PubStart, PubBeforeCommit and PubAfterTraversal events to the WSGI publisher. Changed: U Zope/branches/2.13/doc/CHANGES.rst U Zope/branches/2.13/src/ZPublisher/WSGIPublisher.py -=- Modified: Zope/branches/2.13/doc/CHANGES.rst === --- Zope/branches/2.13/doc/CHANGES.rst 2012-05-24 14:34:07 UTC (rev 126485) +++ Zope/branches/2.13/doc/CHANGES.rst 2012-05-24 16:18:50 UTC (rev 126486) @@ -8,6 +8,9 @@ 2.13.14 (unreleased) +- Added PubStart, PubBeforeCommit and PubAfterTraversal events to the + WSGI publisher. + - ZPublisher: Fixed a traversal regression introduced in 2.13.12. - Updated distributions: Modified: Zope/branches/2.13/src/ZPublisher/WSGIPublisher.py === --- Zope/branches/2.13/src/ZPublisher/WSGIPublisher.py 2012-05-24 14:34:07 UTC (rev 126485) +++ Zope/branches/2.13/src/ZPublisher/WSGIPublisher.py 2012-05-24 16:18:50 UTC (rev 126486) @@ -30,6 +30,7 @@ from ZPublisher.Publish import dont_publish_class from ZPublisher.Publish import get_module_info from ZPublisher.Publish import missing_name +from ZPublisher.pubevents import PubStart, PubBeforeCommit, PubAfterTraversal from ZPublisher.Iterators import IStreamIterator _NOW = None # overwrite for testing @@ -149,6 +150,7 @@ #return '' raise NotImplementedError + def publish(request, module_name, _get_module_info=get_module_info, # only for testing ): @@ -160,8 +162,9 @@ err_hook, validated_hook, transactions_manager, -)= _get_module_info(module_name) +) = _get_module_info(module_name) +notify(PubStart(request)) request.processInputs() response = request.response @@ -181,8 +184,9 @@ # According to RFC1738 a trailing space in the path is valid. path = request.get('PATH_INFO') -request['PARENTS'] = parents = [object] +request['PARENTS'] = [object] object = request.traverse(path, validated_hook=validated_hook) +notify(PubAfterTraversal(request)) if transactions_manager: transactions_manager.recordMetaData(object, request) @@ -201,8 +205,10 @@ if result is not response: response.setBody(result) +notify(PubBeforeCommit(request)) return response + class _RequestCloserForTransaction(object): """Unconditionally close the request at the end of a transaction. ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/trunk/src/ZPublisher/WSGIPublisher.py Forward port c126486 from 2.13 branch
Log message for revision 126487: Forward port c126486 from 2.13 branch Changed: U Zope/trunk/src/ZPublisher/WSGIPublisher.py -=- Modified: Zope/trunk/src/ZPublisher/WSGIPublisher.py === --- Zope/trunk/src/ZPublisher/WSGIPublisher.py 2012-05-24 16:18:50 UTC (rev 126486) +++ Zope/trunk/src/ZPublisher/WSGIPublisher.py 2012-05-24 16:20:08 UTC (rev 126487) @@ -30,6 +30,7 @@ from ZPublisher.Publish import dont_publish_class from ZPublisher.Publish import get_module_info from ZPublisher.Publish import missing_name +from ZPublisher.pubevents import PubStart, PubBeforeCommit, PubAfterTraversal from ZPublisher.Iterators import IStreamIterator _NOW = None # overwrite for testing @@ -149,6 +150,7 @@ #return '' raise NotImplementedError + def publish(request, module_name, _get_module_info=get_module_info, # only for testing ): @@ -160,8 +162,9 @@ err_hook, validated_hook, transactions_manager, -)= _get_module_info(module_name) +) = _get_module_info(module_name) +notify(PubStart(request)) request.processInputs() response = request.response @@ -181,8 +184,9 @@ # According to RFC1738 a trailing space in the path is valid. path = request.get('PATH_INFO') -request['PARENTS'] = parents = [object] +request['PARENTS'] = [object] object = request.traverse(path, validated_hook=validated_hook) +notify(PubAfterTraversal(request)) if transactions_manager: transactions_manager.recordMetaData(object, request) @@ -201,8 +205,10 @@ if result is not response: response.setBody(result) +notify(PubBeforeCommit(request)) return response + class _RequestCloserForTransaction(object): """Unconditionally close the request at the end of a transaction. ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/2.13/doc/WHATSNEW.rst Note limitation regarding ZPublisher.pubevents and the WSGI publisher
Log message for revision 126489: Note limitation regarding ZPublisher.pubevents and the WSGI publisher Changed: U Zope/branches/2.13/doc/WHATSNEW.rst -=- Modified: Zope/branches/2.13/doc/WHATSNEW.rst === --- Zope/branches/2.13/doc/WHATSNEW.rst 2012-05-24 16:47:26 UTC (rev 126488) +++ Zope/branches/2.13/doc/WHATSNEW.rst 2012-05-24 16:47:26 UTC (rev 126489) @@ -83,7 +83,11 @@ for a WSGI setup yet. You are expected to know exactly what you are doing if you are trying to use this feature. +Due to the way logic is split out into WSGI middleware, some of the +`ZPublisher.pubevents` aren't emitted by the WSGI publisher. These are: +`PubSuccess`, `PubFailure`, `PubBeforeCommit` and `PubBeforeAbort`. + Zope Toolkit ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/2.13/ LP #838978: Fixed TypeError in cache_detail ZMI view.
Log message for revision 126512: LP #838978: Fixed TypeError in cache_detail ZMI view. Changed: U Zope/branches/2.13/doc/CHANGES.rst U Zope/branches/2.13/src/App/CacheManager.py -=- Modified: Zope/branches/2.13/doc/CHANGES.rst === --- Zope/branches/2.13/doc/CHANGES.rst 2012-05-28 12:24:03 UTC (rev 126511) +++ Zope/branches/2.13/doc/CHANGES.rst 2012-05-28 12:48:01 UTC (rev 126512) @@ -8,6 +8,8 @@ 2.13.14 (unreleased) +- LP #838978: Fixed TypeError in cache_detail ZMI view. + - Cleanup lock and pid files if the process dies early in startup. - Added PubStart, PubBeforeCommit and PubAfterTraversal events to the Modified: Zope/branches/2.13/src/App/CacheManager.py === --- Zope/branches/2.13/src/App/CacheManager.py 2012-05-28 12:24:03 UTC (rev 126511) +++ Zope/branches/2.13/src/App/CacheManager.py 2012-05-28 12:48:01 UTC (rev 126512) @@ -102,10 +102,10 @@ if REQUEST is not None: # format as text REQUEST.RESPONSE.setHeader('Content-Type', 'text/plain') -return '\n'.join('%6d %s'%(count, name) for count, name in detail) -else: -# raw -return detail +return '\n'.join( +['%6d %s' % (count, name) for name, count in detail]) +# raw +return detail def cache_extreme_detail(self, REQUEST=None): """ ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/trunk/src/App/CacheManager.py Merge c126512 from 2.13 branch
Log message for revision 126513: Merge c126512 from 2.13 branch Changed: U Zope/trunk/src/App/CacheManager.py -=- Modified: Zope/trunk/src/App/CacheManager.py === --- Zope/trunk/src/App/CacheManager.py 2012-05-28 12:48:01 UTC (rev 126512) +++ Zope/trunk/src/App/CacheManager.py 2012-05-28 12:48:52 UTC (rev 126513) @@ -97,10 +97,10 @@ if REQUEST is not None: # format as text REQUEST.RESPONSE.setHeader('Content-Type', 'text/plain') -return '\n'.join('%6d %s'%(count, name) for count, name in detail) -else: -# raw -return detail +return '\n'.join( +['%6d %s' % (count, name) for name, count in detail]) +# raw +return detail def cache_extreme_detail(self, REQUEST=None): """ ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/2.13/ LP #975039: Don't translate interface names in edit_markers ZMI view.
Log message for revision 126514: LP #975039: Don't translate interface names in edit_markers ZMI view. Changed: U Zope/branches/2.13/doc/CHANGES.rst U Zope/branches/2.13/src/Products/Five/utilities/browser/edit_markers.pt -=- Modified: Zope/branches/2.13/doc/CHANGES.rst === --- Zope/branches/2.13/doc/CHANGES.rst 2012-05-28 12:48:52 UTC (rev 126513) +++ Zope/branches/2.13/doc/CHANGES.rst 2012-05-28 13:13:48 UTC (rev 126514) @@ -8,6 +8,8 @@ 2.13.14 (unreleased) +- LP #975039: Don't translate interface names in edit_markers ZMI view. + - LP #838978: Fixed TypeError in cache_detail ZMI view. - Cleanup lock and pid files if the process dies early in startup. Modified: Zope/branches/2.13/src/Products/Five/utilities/browser/edit_markers.pt === --- Zope/branches/2.13/src/Products/Five/utilities/browser/edit_markers.pt 2012-05-28 12:48:52 UTC (rev 126513) +++ Zope/branches/2.13/src/Products/Five/utilities/browser/edit_markers.pt 2012-05-28 13:13:48 UTC (rev 126514) @@ -24,13 +24,13 @@ INTERFACE +tal:content="interface/name">INTERFACE INTERFACE +tal:content="interface/name">INTERFACE @@ -47,7 +47,7 @@ INTERFACE +tal:content="interface/name">INTERFACE https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/trunk/src/Products/Five/utilities/browser/edit_markers.pt Merge c126514 from 2.13 branch
Log message for revision 126515: Merge c126514 from 2.13 branch Changed: U Zope/trunk/src/Products/Five/utilities/browser/edit_markers.pt -=- Modified: Zope/trunk/src/Products/Five/utilities/browser/edit_markers.pt === --- Zope/trunk/src/Products/Five/utilities/browser/edit_markers.pt 2012-05-28 13:13:48 UTC (rev 126514) +++ Zope/trunk/src/Products/Five/utilities/browser/edit_markers.pt 2012-05-28 13:15:14 UTC (rev 126515) @@ -24,13 +24,13 @@ INTERFACE +tal:content="interface/name">INTERFACE INTERFACE +tal:content="interface/name">INTERFACE @@ -47,7 +47,7 @@ INTERFACE +tal:content="interface/name">INTERFACE https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/2.13/ LP #950689: Fix HTTPS detection under mod_wsgi.
Log message for revision 126516: LP #950689: Fix HTTPS detection under mod_wsgi. Changed: U Zope/branches/2.13/doc/CHANGES.rst U Zope/branches/2.13/src/ZPublisher/HTTPRequest.py -=- Modified: Zope/branches/2.13/doc/CHANGES.rst === --- Zope/branches/2.13/doc/CHANGES.rst 2012-05-28 13:15:14 UTC (rev 126515) +++ Zope/branches/2.13/doc/CHANGES.rst 2012-05-28 13:29:31 UTC (rev 126516) @@ -8,6 +8,8 @@ 2.13.14 (unreleased) +- LP #950689: Fix HTTPS detection under mod_wsgi. + - LP #975039: Don't translate interface names in edit_markers ZMI view. - LP #838978: Fixed TypeError in cache_detail ZMI view. Modified: Zope/branches/2.13/src/ZPublisher/HTTPRequest.py === --- Zope/branches/2.13/src/ZPublisher/HTTPRequest.py2012-05-28 13:15:14 UTC (rev 126515) +++ Zope/branches/2.13/src/ZPublisher/HTTPRequest.py2012-05-28 13:29:31 UTC (rev 126516) @@ -383,8 +383,8 @@ if server_url is not None: other['SERVER_URL'] = server_url = server_url.strip() else: -if 'HTTPS' in environ and ( -environ['HTTPS'] == "on" or environ['HTTPS'] == "ON"): +https_environ = environ.get('HTTPS', False) +if https_environ and https_environ in ('on', 'ON', '1'): protocol = 'https' elif ('SERVER_PORT_SECURE' in environ and environ['SERVER_PORT_SECURE'] == "1"): ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/trunk/src/ZPublisher/HTTPRequest.py Merge c126516 from 2.13 branch
Log message for revision 126517: Merge c126516 from 2.13 branch Changed: U Zope/trunk/src/ZPublisher/HTTPRequest.py -=- Modified: Zope/trunk/src/ZPublisher/HTTPRequest.py === --- Zope/trunk/src/ZPublisher/HTTPRequest.py2012-05-28 13:29:31 UTC (rev 126516) +++ Zope/trunk/src/ZPublisher/HTTPRequest.py2012-05-28 13:30:50 UTC (rev 126517) @@ -381,8 +381,8 @@ if server_url is not None: other['SERVER_URL'] = server_url = server_url.strip() else: -if 'HTTPS' in environ and ( -environ['HTTPS'] == "on" or environ['HTTPS'] == "ON"): +https_environ = environ.get('HTTPS', False) +if https_environ and https_environ in ('on', 'ON', '1'): protocol = 'https' elif ('SERVER_PORT_SECURE' in environ and environ['SERVER_PORT_SECURE'] == "1"): ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/2.13/ Updated to Zope Toolkit 1.0.7
Log message for revision 126521: Updated to Zope Toolkit 1.0.7 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 2012-05-30 13:45:56 UTC (rev 126520) +++ Zope/branches/2.13/doc/CHANGES.rst 2012-05-30 13:47:41 UTC (rev 126521) @@ -21,6 +21,8 @@ - ZPublisher: Fixed a traversal regression introduced in 2.13.12. +- Updated to Zope Toolkit 1.0.7. + - Updated distributions: - Products.ZCatalog = 2.13.23 Modified: Zope/branches/2.13/versions.cfg === --- Zope/branches/2.13/versions.cfg 2012-05-30 13:45:56 UTC (rev 126520) +++ Zope/branches/2.13/versions.cfg 2012-05-30 13:47:41 UTC (rev 126521) @@ -1,5 +1,5 @@ [buildout] -extends = http://download.zope.org/zopetoolkit/index/1.0.6/ztk-versions.cfg +extends = http://download.zope.org/zopetoolkit/index/1.0.7/ztk-versions.cfg versions = versions [versions] ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/2.13/ prepare
Log message for revision 126529: prepare 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 2012-05-30 22:52:46 UTC (rev 126528) +++ Zope/branches/2.13/doc/CHANGES.rst 2012-05-31 13:01:31 UTC (rev 126529) @@ -5,7 +5,7 @@ Change information for previous versions of Zope can be found at http://docs.zope.org/zope2/releases/. -2.13.14 (unreleased) +2.13.14 (2012-05-31) - LP #950689: Fix HTTPS detection under mod_wsgi. Modified: Zope/branches/2.13/setup.py === --- Zope/branches/2.13/setup.py 2012-05-30 22:52:46 UTC (rev 126528) +++ Zope/branches/2.13/setup.py 2012-05-31 13:01:31 UTC (rev 126529) @@ -23,7 +23,7 @@ setup(name='Zope2', -version='2.13.14dev', +version='2.13.14', 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 2012-05-30 22:52:46 UTC (rev 126528) +++ Zope/branches/2.13/versions.cfg 2012-05-31 13:01:31 UTC (rev 126529) @@ -4,7 +4,7 @@ [versions] # Zope2-specific -Zope2 = +Zope2 = 2.13.14 AccessControl = 2.13.7 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.14/ tagged
Log message for revision 126530: tagged Changed: A Zope/tags/2.13.14/ -=- ___ 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 126531: 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 2012-05-31 13:01:56 UTC (rev 126530) +++ Zope/branches/2.13/doc/CHANGES.rst 2012-05-31 13:03:11 UTC (rev 126531) @@ -5,6 +5,10 @@ Change information for previous versions of Zope can be found at http://docs.zope.org/zope2/releases/. +2.13.15 (unreleased) + + + 2.13.14 (2012-05-31) Modified: Zope/branches/2.13/setup.py === --- Zope/branches/2.13/setup.py 2012-05-31 13:01:56 UTC (rev 126530) +++ Zope/branches/2.13/setup.py 2012-05-31 13:03:11 UTC (rev 126531) @@ -23,7 +23,7 @@ setup(name='Zope2', -version='2.13.14', +version='2.13.15dev', 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 2012-05-31 13:01:56 UTC (rev 126530) +++ Zope/branches/2.13/versions.cfg 2012-05-31 13:03:11 UTC (rev 126531) @@ -4,7 +4,7 @@ [versions] # Zope2-specific -Zope2 = 2.13.14 +Zope2 = AccessControl = 2.13.7 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/branches/2.13/ update to zdaemon = 2.0.7
Log message for revision 126995: update to zdaemon = 2.0.7 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 2012-06-22 10:40:22 UTC (rev 126994) +++ Zope/branches/2.13/doc/CHANGES.rst 2012-06-22 10:41:54 UTC (rev 126995) @@ -10,7 +10,10 @@ - Fix lock file cleanup if there's an error early in startup. +- Updated distributions: + - zdaemon = 2.0.7 + 2.13.14 (2012-05-31) Modified: Zope/branches/2.13/versions.cfg === --- Zope/branches/2.13/versions.cfg 2012-06-22 10:40:22 UTC (rev 126994) +++ Zope/branches/2.13/versions.cfg 2012-06-22 10:41:54 UTC (rev 126995) @@ -35,6 +35,8 @@ mechanize = 0.2.5 python-gettext = 1.2 ZConfig = 2.9.0 +# security fix, not yet in ZTK 1.0.7 +zdaemon = 2.0.7 ZODB3 = 3.10.5 # Zope2 dependencies ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/2.12/ updated to zdaemon = 2.0.7
Log message for revision 126996: updated to zdaemon = 2.0.7 Changed: U Zope/branches/2.12/doc/CHANGES.rst U Zope/branches/2.12/versions.cfg -=- Modified: Zope/branches/2.12/doc/CHANGES.rst === --- Zope/branches/2.12/doc/CHANGES.rst 2012-06-22 10:41:54 UTC (rev 126995) +++ Zope/branches/2.12/doc/CHANGES.rst 2012-06-22 10:42:35 UTC (rev 126996) @@ -10,6 +10,7 @@ - Updated distributions: + - zdaemon = 2.0.7 - zope.tales = 3.4.1 2.12.23 (2012-02-20) Modified: Zope/branches/2.12/versions.cfg === --- Zope/branches/2.12/versions.cfg 2012-06-22 10:41:54 UTC (rev 126995) +++ Zope/branches/2.12/versions.cfg 2012-06-22 10:42:35 UTC (rev 126996) @@ -37,7 +37,7 @@ zc.recipe.egg = 1.2.2 zc.recipe.testrunner = 1.2.1 ZConfig = 2.7.1 -zdaemon = 2.0.4 +zdaemon = 2.0.7 zLOG = 2.11.1 ZODB3 = 3.9.7 zodbcode = 3.4.0 ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/2.13/ prepare
Log message for revision 126997: prepare 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 2012-06-22 10:42:35 UTC (rev 126996) +++ Zope/branches/2.13/doc/CHANGES.rst 2012-06-22 10:46:42 UTC (rev 126997) @@ -5,7 +5,7 @@ Change information for previous versions of Zope can be found at http://docs.zope.org/zope2/releases/. -2.13.15 (unreleased) +2.13.15 (2012-06-22) - Fix lock file cleanup if there's an error early in startup. Modified: Zope/branches/2.13/setup.py === --- Zope/branches/2.13/setup.py 2012-06-22 10:42:35 UTC (rev 126996) +++ Zope/branches/2.13/setup.py 2012-06-22 10:46:42 UTC (rev 126997) @@ -23,7 +23,7 @@ setup(name='Zope2', -version='2.13.15dev', +version='2.13.15', 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 2012-06-22 10:42:35 UTC (rev 126996) +++ Zope/branches/2.13/versions.cfg 2012-06-22 10:46:42 UTC (rev 126997) @@ -4,7 +4,7 @@ [versions] # Zope2-specific -Zope2 = +Zope2 = 2.13.15 AccessControl = 2.13.7 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.15/ tagged
Log message for revision 126998: tagged Changed: A Zope/tags/2.13.15/ -=- ___ 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 126999: 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 2012-06-22 10:46:57 UTC (rev 126998) +++ Zope/branches/2.13/doc/CHANGES.rst 2012-06-22 10:48:32 UTC (rev 126999) @@ -5,6 +5,10 @@ Change information for previous versions of Zope can be found at http://docs.zope.org/zope2/releases/. +2.13.16 (unreleased) + + + 2.13.15 (2012-06-22) Modified: Zope/branches/2.13/setup.py === --- Zope/branches/2.13/setup.py 2012-06-22 10:46:57 UTC (rev 126998) +++ Zope/branches/2.13/setup.py 2012-06-22 10:48:32 UTC (rev 126999) @@ -23,7 +23,7 @@ setup(name='Zope2', -version='2.13.15', +version='2.13.16dev', 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 2012-06-22 10:46:57 UTC (rev 126998) +++ Zope/branches/2.13/versions.cfg 2012-06-22 10:48:32 UTC (rev 126999) @@ -4,7 +4,7 @@ [versions] # Zope2-specific -Zope2 = 2.13.15 +Zope2 = AccessControl = 2.13.7 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/branches/2.13/ AccessControl = 2.13.8
Log message for revision 127006: AccessControl = 2.13.8 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 2012-06-22 10:57:47 UTC (rev 127005) +++ Zope/branches/2.13/doc/CHANGES.rst 2012-06-22 11:04:07 UTC (rev 127006) @@ -8,7 +8,10 @@ 2.13.16 (unreleased) +- Updated distributions: + - AccessControl = 2.13.8 + 2.13.15 (2012-06-22) Modified: Zope/branches/2.13/versions.cfg === --- Zope/branches/2.13/versions.cfg 2012-06-22 10:57:47 UTC (rev 127005) +++ Zope/branches/2.13/versions.cfg 2012-06-22 11:04:07 UTC (rev 127006) @@ -5,7 +5,7 @@ [versions] # Zope2-specific Zope2 = -AccessControl = 2.13.7 +AccessControl = 2.13.8 Acquisition = 2.13.8 DateTime = 2.12.6 DocumentTemplate = 2.13.2 ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/trunk/ AccessControl = 3.0.2
Log message for revision 127008: AccessControl = 3.0.2 Changed: U Zope/trunk/doc/CHANGES.rst U Zope/trunk/versions.cfg -=- Modified: Zope/trunk/doc/CHANGES.rst === --- Zope/trunk/doc/CHANGES.rst 2012-06-22 11:04:22 UTC (rev 127007) +++ Zope/trunk/doc/CHANGES.rst 2012-06-22 11:05:02 UTC (rev 127008) @@ -62,7 +62,7 @@ - Updated distributions: - - AccessControl = 3.0.1 + - AccessControl = 3.0.2 - Acquisition = 4.0a1 - DateTime = 3.0 - ExtensionClass = 4.0a1 Modified: Zope/trunk/versions.cfg === --- Zope/trunk/versions.cfg 2012-06-22 11:04:22 UTC (rev 127007) +++ Zope/trunk/versions.cfg 2012-06-22 11:05:02 UTC (rev 127008) @@ -5,7 +5,7 @@ [versions] # Zope2-specific Zope2 = -AccessControl = 3.0.1 +AccessControl = 3.0.2 Acquisition = 4.0a1 DateTime = 3.0 DocumentTemplate = 2.13.2 ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/2.13/ update to DT 2.12.7
Log message for revision 127477: update to DT 2.12.7 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 2012-08-10 22:15:20 UTC (rev 127476) +++ Zope/branches/2.13/doc/CHANGES.rst 2012-08-10 22:18:07 UTC (rev 127477) @@ -13,6 +13,7 @@ - Updated distributions: - AccessControl = 2.13.8 + - DateTime = 2.12.7 - ZPublisher: Do not assume that you can iterate over a publishable object Modified: Zope/branches/2.13/versions.cfg === --- Zope/branches/2.13/versions.cfg 2012-08-10 22:15:20 UTC (rev 127476) +++ Zope/branches/2.13/versions.cfg 2012-08-10 22:18:07 UTC (rev 127477) @@ -7,7 +7,7 @@ Zope2 = AccessControl = 2.13.8 Acquisition = 2.13.8 -DateTime = 2.12.6 +DateTime = 2.12.7 DocumentTemplate = 2.13.2 ExtensionClass = 2.13.2 initgroups = 2.13.0 ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/2.13/doc/CHANGES.rst prettify changelog
Log message for revision 127478: prettify changelog Changed: U Zope/branches/2.13/doc/CHANGES.rst -=- Modified: Zope/branches/2.13/doc/CHANGES.rst === --- Zope/branches/2.13/doc/CHANGES.rst 2012-08-10 22:18:07 UTC (rev 127477) +++ Zope/branches/2.13/doc/CHANGES.rst 2012-08-10 22:18:51 UTC (rev 127478) @@ -8,17 +8,17 @@ 2.13.16 (unreleased) -- OFS: Fixed TypeError handling in unrestrictedTraverse. - - Updated distributions: - AccessControl = 2.13.8 - DateTime = 2.12.7 -- ZPublisher: Do not assume that you can iterate over a publishable object +- OFS: Fixed TypeError handling in unrestrictedTraverse. -- ZPublisher: Do not guess it is a webdav request if the http method is purge +- ZPublisher: Do not assume that you can iterate over a publishable object. +- ZPublisher: Do not guess it is a webdav request if the HTTP method is purge. + 2.13.15 (2012-06-22) ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/2.13/versions.cfg update to ZTK 1.0.x branch changes (via manual backport for now)
Log message for revision 127481: update to ZTK 1.0.x branch changes (via manual backport for now) Changed: U Zope/branches/2.13/versions.cfg -=- Modified: Zope/branches/2.13/versions.cfg === --- Zope/branches/2.13/versions.cfg 2012-08-10 22:23:49 UTC (rev 127480) +++ Zope/branches/2.13/versions.cfg 2012-08-10 22:28:43 UTC (rev 127481) @@ -35,10 +35,14 @@ mechanize = 0.2.5 python-gettext = 1.2 ZConfig = 2.9.0 -# security fix, not yet in ZTK 1.0.7 -zdaemon = 2.0.7 ZODB3 = 3.10.5 +# ZTK 1.0.8 backports +distribute = 0.6.28 +mr.developer = 1.21 +zdaemon = 2.0.7 +pytz = 2012d + # Zope2 dependencies repoze.retry = 1.0 repoze.tm2 = 1.0b2 ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/2.13/ prepare
Log message for revision 127490: prepare 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 2012-08-11 16:09:04 UTC (rev 127489) +++ Zope/branches/2.13/doc/CHANGES.rst 2012-08-11 16:27:10 UTC (rev 127490) @@ -5,7 +5,7 @@ Change information for previous versions of Zope can be found at http://docs.zope.org/zope2/releases/. -2.13.16 (unreleased) +2.13.16 (2012-08-11) - Updated distributions: Modified: Zope/branches/2.13/setup.py === --- Zope/branches/2.13/setup.py 2012-08-11 16:09:04 UTC (rev 127489) +++ Zope/branches/2.13/setup.py 2012-08-11 16:27:10 UTC (rev 127490) @@ -23,7 +23,7 @@ setup(name='Zope2', -version='2.13.16dev', +version='2.13.16', 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 2012-08-11 16:09:04 UTC (rev 127489) +++ Zope/branches/2.13/versions.cfg 2012-08-11 16:27:10 UTC (rev 127490) @@ -4,7 +4,7 @@ [versions] # Zope2-specific -Zope2 = +Zope2 = 2.13.16 AccessControl = 2.13.8 Acquisition = 2.13.8 DateTime = 2.12.7 ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/tags/2.13.16/ tagged
Log message for revision 127491: tagged Changed: A Zope/tags/2.13.16/ -=- ___ 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 127492: 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 2012-08-11 16:28:28 UTC (rev 127491) +++ Zope/branches/2.13/doc/CHANGES.rst 2012-08-11 16:30:12 UTC (rev 127492) @@ -5,6 +5,10 @@ Change information for previous versions of Zope can be found at http://docs.zope.org/zope2/releases/. +2.13.17 (unreleased) + + + 2.13.16 (2012-08-11) Modified: Zope/branches/2.13/setup.py === --- Zope/branches/2.13/setup.py 2012-08-11 16:28:28 UTC (rev 127491) +++ Zope/branches/2.13/setup.py 2012-08-11 16:30:12 UTC (rev 127492) @@ -23,7 +23,7 @@ setup(name='Zope2', -version='2.13.16', +version='2.13.17dev', 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 2012-08-11 16:28:28 UTC (rev 127491) +++ Zope/branches/2.13/versions.cfg 2012-08-11 16:30:12 UTC (rev 127492) @@ -4,7 +4,7 @@ [versions] # Zope2-specific -Zope2 = 2.13.16 +Zope2 = AccessControl = 2.13.8 Acquisition = 2.13.8 DateTime = 2.12.7 ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/2.12/ Backport `rolesForPermissionOn` fix from standalone AccessControl project
Log message for revision 127557: Backport `rolesForPermissionOn` fix from standalone AccessControl project Changed: U Zope/branches/2.12/doc/CHANGES.rst U Zope/branches/2.12/src/AccessControl/ZopeSecurityPolicy.py U Zope/branches/2.12/src/AccessControl/tests/testZopeSecurityPolicy.py -=- Modified: Zope/branches/2.12/doc/CHANGES.rst === --- Zope/branches/2.12/doc/CHANGES.rst 2012-08-23 14:20:11 UTC (rev 127556) +++ Zope/branches/2.12/doc/CHANGES.rst 2012-08-23 14:31:42 UTC (rev 127557) @@ -8,6 +8,9 @@ 2.12.24 (unreleased) +- Fix a bug in ZopeSecurityPolicy.py. Global variable `rolesForPermissionOn` + could be overridden if `__role__` had custom rolesForPermissionOn. + - Updated distributions: - zdaemon = 2.0.7 Modified: Zope/branches/2.12/src/AccessControl/ZopeSecurityPolicy.py === --- Zope/branches/2.12/src/AccessControl/ZopeSecurityPolicy.py 2012-08-23 14:20:11 UTC (rev 127556) +++ Zope/branches/2.12/src/AccessControl/ZopeSecurityPolicy.py 2012-08-23 14:31:42 UTC (rev 127557) @@ -52,9 +52,10 @@ if roles is None or isinstance(roles, tuple_or_list): return roles - -rolesForPermissionOn = getattr(roles, 'rolesForPermissionOn', None) -if rolesForPermissionOn is not None: -roles = rolesForPermissionOn(value) +# Do not override global variable `rolesForPermissionOn`. +roles_rolesForPermissionOn = getattr(roles, 'rolesForPermissionOn', None) +if roles_rolesForPermissionOn is not None: +roles = roles_rolesForPermissionOn(value) + return roles Modified: Zope/branches/2.12/src/AccessControl/tests/testZopeSecurityPolicy.py === --- Zope/branches/2.12/src/AccessControl/tests/testZopeSecurityPolicy.py 2012-08-23 14:20:11 UTC (rev 127556) +++ Zope/branches/2.12/src/AccessControl/tests/testZopeSecurityPolicy.py 2012-08-23 14:31:42 UTC (rev 127557) @@ -10,14 +10,12 @@ # FOR A PARTICULAR PURPOSE # ## -"""Tests of ZopeSecurityPolicy -""" -__rcs_id__='$Id$' -__version__='$Revision: 1.10 $'[11:-2] +import os +import sys +import thread +import unittest -import os, sys, unittest - import ZODB try: from zExceptions import Unauthorized @@ -576,11 +574,61 @@ from doctest import DocTestSuite + +class GetRolesWithMultiThreadTest(unittest.TestCase): + +def setUp(self): +self._original_check_interval = sys.getcheckinterval() +sys.setcheckinterval(1) + +def tearDown(self): +sys.setcheckinterval(self._original_check_interval) + +def testGetRolesWithMultiThread(self): +from AccessControl.ZopeSecurityPolicy import getRoles + +class C(object): +pass + +class V1(object): +class __roles__(object): +@staticmethod +def rolesForPermissionOn(ob): +return ['Member'] + +class V2(object): +class __roles__(object): +@staticmethod +def rolesForPermissionOn(ob): +return ['User'] + +c = C() +c.v1 = V1() +c.v2 = V2() + +self.assertEqual(getRoles(c, None, c.v1, 42), ['Member']) +self.assertEqual(getRoles(c, None, c.v2, 42), ['User']) +mark = [] + +def loop(): +while 1: +getRoles(c, None, c.v2, 42) +if len(mark) > 0: +return +thread.start_new_thread(loop, ()) +try: +for i in range(1000): +self.assertEqual(getRoles(c, None, c.v1, 42), ['Member']) +finally: +mark.append(None) + + def test_suite(): suite = unittest.TestSuite() suite.addTest(unittest.makeSuite(Python_ZSPTests, 'test')) suite.addTest(unittest.makeSuite(C_ZSPTests, 'test')) suite.addTest(DocTestSuite()) +suite.addTest(unittest.makeSuite(GetRolesWithMultiThreadTest)) return suite def main(): ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/2.13/ AccessControl = 2.13.9
Log message for revision 127558: AccessControl = 2.13.9 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 2012-08-23 14:31:42 UTC (rev 127557) +++ Zope/branches/2.13/doc/CHANGES.rst 2012-08-23 14:35:48 UTC (rev 127558) @@ -8,7 +8,10 @@ 2.13.17 (unreleased) +- Updated distributions: + - AccessControl = 2.13.9 + 2.13.16 (2012-08-11) Modified: Zope/branches/2.13/versions.cfg === --- Zope/branches/2.13/versions.cfg 2012-08-23 14:31:42 UTC (rev 127557) +++ Zope/branches/2.13/versions.cfg 2012-08-23 14:35:48 UTC (rev 127558) @@ -5,7 +5,7 @@ [versions] # Zope2-specific Zope2 = -AccessControl = 2.13.8 +AccessControl = 2.13.9 Acquisition = 2.13.8 DateTime = 2.12.7 DocumentTemplate = 2.13.2 ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/trunk/ AccessControl = 3.0.3
Log message for revision 127559: AccessControl = 3.0.3 Changed: U Zope/trunk/doc/CHANGES.rst U Zope/trunk/versions.cfg -=- Modified: Zope/trunk/doc/CHANGES.rst === --- Zope/trunk/doc/CHANGES.rst 2012-08-23 14:35:48 UTC (rev 127558) +++ Zope/trunk/doc/CHANGES.rst 2012-08-23 14:36:36 UTC (rev 127559) @@ -62,7 +62,7 @@ - Updated distributions: - - AccessControl = 3.0.2 + - AccessControl = 3.0.3 - Acquisition = 4.0a1 - DateTime = 3.0 - ExtensionClass = 4.0a1 Modified: Zope/trunk/versions.cfg === --- Zope/trunk/versions.cfg 2012-08-23 14:35:48 UTC (rev 127558) +++ Zope/trunk/versions.cfg 2012-08-23 14:36:36 UTC (rev 127559) @@ -5,7 +5,7 @@ [versions] # Zope2-specific Zope2 = -AccessControl = 3.0.2 +AccessControl = 3.0.3 Acquisition = 4.0a1 DateTime = 3.0 DocumentTemplate = 2.13.2 ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/trunk/doc/WHATSNEW.rst remove some wishful thinking from the `what's new` document. someone actually believed this stuff.
Log message for revision 127624: remove some wishful thinking from the `what's new` document. someone actually believed this stuff. Changed: U Zope/trunk/doc/WHATSNEW.rst -=- Modified: Zope/trunk/doc/WHATSNEW.rst === --- Zope/trunk/doc/WHATSNEW.rst 2012-08-30 10:45:46 UTC (rev 127623) +++ Zope/trunk/doc/WHATSNEW.rst 2012-08-30 13:46:09 UTC (rev 127624) @@ -12,22 +12,21 @@ Version numbering increase -- -- Reflect departure from TTW-development model -- Various backwards incompatible changes (removed code) -- Zope 3 vs. 4 +Version numbers for Zope have been confusing in the past. The original Zope +project iterated trough version one to two up to version 2.13. In parallel +a separate project was launched using the name Zope 3. Zope 3 wasn't a new +version of the original Zope project and in hindsight should have used a +different project name. These days this effort is known as BlueBream. +In order to avoid confusion between the separate Zope 3 project and a new +version of this project, it was decided to skip ahead and use Zope 4.0 as the +next version number. The increase in the major part of the version also +indicates the clear intention to allow backwards incompatible changes. + Memory use -- -- DateTime -- no more icons/images -- no more default content -- get some numbers for startup and startup after viewing the ZMI - - -Good bye TTW development - - -- ZMI getting stripped down -- a lot less functionality OOTB -- fewer zope.conf options +Zope 4 depends on the new DateTime version 3. DateTime 3 has been optimized +for better memory use. Applications using a lot of DateTime values like the +Plone CMS have seen total memory usage to decrease by 10% to 20% for medium +to large deployments. ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/2.13/ Products.PythonScripts = 2.13.1
Log message for revision 127784: Products.PythonScripts = 2.13.1 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 2012-09-09 10:41:00 UTC (rev 127783) +++ Zope/branches/2.13/doc/CHANGES.rst 2012-09-09 10:41:38 UTC (rev 127784) @@ -11,6 +11,7 @@ - Updated distributions: - AccessControl = 2.13.9 + - Products.PythonScripts = 2.13.1 2.13.16 (2012-08-11) Modified: Zope/branches/2.13/versions.cfg === --- Zope/branches/2.13/versions.cfg 2012-09-09 10:41:00 UTC (rev 127783) +++ Zope/branches/2.13/versions.cfg 2012-09-09 10:41:38 UTC (rev 127784) @@ -20,7 +20,7 @@ Products.MailHost = 2.13.1 Products.MIMETools = 2.13.0 Products.OFSP = 2.13.2 -Products.PythonScripts = 2.13.0 +Products.PythonScripts = 2.13.1 Products.StandardCacheManagers = 2.13.0 Products.ZCatalog = 2.13.23 Products.ZCTextIndex = 2.13.3 ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/trunk/versions.cfg Products.PythonScripts = 2.13.1
Log message for revision 127785: Products.PythonScripts = 2.13.1 Changed: U Zope/trunk/versions.cfg -=- Modified: Zope/trunk/versions.cfg === --- Zope/trunk/versions.cfg 2012-09-09 10:41:38 UTC (rev 127784) +++ Zope/trunk/versions.cfg 2012-09-09 10:42:37 UTC (rev 127785) @@ -28,7 +28,7 @@ Products.BTreeFolder2 = 2.13.4 Products.ExternalMethod = 2.13.0 Products.MailHost = 2.13.1 -Products.PythonScripts = 2.13.0 +Products.PythonScripts = 2.13.1 Products.StandardCacheManagers = 2.13.0 # ZTK KGS overrides ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/2.13/ Products.PythonScripts = 2.13.2
Log message for revision 127790: Products.PythonScripts = 2.13.2 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 2012-09-09 11:12:33 UTC (rev 127789) +++ Zope/branches/2.13/doc/CHANGES.rst 2012-09-09 11:13:03 UTC (rev 127790) @@ -11,7 +11,7 @@ - Updated distributions: - AccessControl = 2.13.9 - - Products.PythonScripts = 2.13.1 + - Products.PythonScripts = 2.13.2 2.13.16 (2012-08-11) Modified: Zope/branches/2.13/versions.cfg === --- Zope/branches/2.13/versions.cfg 2012-09-09 11:12:33 UTC (rev 127789) +++ Zope/branches/2.13/versions.cfg 2012-09-09 11:13:03 UTC (rev 127790) @@ -20,7 +20,7 @@ Products.MailHost = 2.13.1 Products.MIMETools = 2.13.0 Products.OFSP = 2.13.2 -Products.PythonScripts = 2.13.1 +Products.PythonScripts = 2.13.2 Products.StandardCacheManagers = 2.13.0 Products.ZCatalog = 2.13.23 Products.ZCTextIndex = 2.13.3 ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/trunk/versions.cfg Products.PythonScripts = 2.13.2
Log message for revision 127791: Products.PythonScripts = 2.13.2 Changed: U Zope/trunk/versions.cfg -=- Modified: Zope/trunk/versions.cfg === --- Zope/trunk/versions.cfg 2012-09-09 11:13:03 UTC (rev 127790) +++ Zope/trunk/versions.cfg 2012-09-09 11:13:26 UTC (rev 127791) @@ -28,7 +28,7 @@ Products.BTreeFolder2 = 2.13.4 Products.ExternalMethod = 2.13.0 Products.MailHost = 2.13.1 -Products.PythonScripts = 2.13.1 +Products.PythonScripts = 2.13.2 Products.StandardCacheManagers = 2.13.0 # ZTK KGS overrides ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/2.12/ LP #1047318: Tighten import restrictions for restricted code.
Log message for revision 127792: LP #1047318: Tighten import restrictions for restricted code. Changed: U Zope/branches/2.12/doc/CHANGES.rst U Zope/branches/2.12/setup.py U Zope/branches/2.12/src/AccessControl/SecurityInfo.py U Zope/branches/2.12/src/AccessControl/ZopeGuards.py U Zope/branches/2.12/src/AccessControl/__init__.py U Zope/branches/2.12/src/AccessControl/tests/testModuleSecurity.py U Zope/branches/2.12/src/AccessControl/tests/testZopeGuards.py U Zope/branches/2.12/src/Products/PythonScripts/standard.py U Zope/branches/2.12/src/Products/PythonScripts/tests/testPythonScript.py -=- Modified: Zope/branches/2.12/doc/CHANGES.rst === --- Zope/branches/2.12/doc/CHANGES.rst 2012-09-09 11:13:26 UTC (rev 127791) +++ Zope/branches/2.12/doc/CHANGES.rst 2012-09-09 12:55:26 UTC (rev 127792) @@ -5,9 +5,11 @@ Change information for previous versions of Zope can be found at http://docs.zope.org/zope2/releases/. -2.12.24 (unreleased) +2.12.24 (2012-09-09) +- LP #1047318: Tighten import restrictions for restricted code. + - Fix a bug in ZopeSecurityPolicy.py. Global variable `rolesForPermissionOn` could be overridden if `__role__` had custom rolesForPermissionOn. Modified: Zope/branches/2.12/setup.py === --- Zope/branches/2.12/setup.py 2012-09-09 11:13:26 UTC (rev 127791) +++ Zope/branches/2.12/setup.py 2012-09-09 12:55:26 UTC (rev 127792) @@ -16,7 +16,7 @@ from setuptools import setup, find_packages, Extension setup(name='Zope2', -version='2.12.24dev', +version='2.12.24', url='http://www.zope.org', license='ZPL 2.1', description='Zope2 application server / web framework', Modified: Zope/branches/2.12/src/AccessControl/SecurityInfo.py === --- Zope/branches/2.12/src/AccessControl/SecurityInfo.py2012-09-09 11:13:26 UTC (rev 127791) +++ Zope/branches/2.12/src/AccessControl/SecurityInfo.py2012-09-09 12:55:26 UTC (rev 127792) @@ -211,7 +211,9 @@ def secureModule(mname, *imp): modsec = _moduleSecurity.get(mname, None) if modsec is None: -return +if mname in _appliedModuleSecurity: +return sys.modules[mname] +return # no MSI, no module if imp: __import__(mname, *imp) Modified: Zope/branches/2.12/src/AccessControl/ZopeGuards.py === --- Zope/branches/2.12/src/AccessControl/ZopeGuards.py 2012-09-09 11:13:26 UTC (rev 127791) +++ Zope/branches/2.12/src/AccessControl/ZopeGuards.py 2012-09-09 12:55:26 UTC (rev 127792) @@ -310,7 +310,7 @@ return list.sorted(iterable, cmp=None, key=None, reverse=False) safe_builtins['list'] = GuardedListType() - + class GuardedDictType: def __call__(self, *args, **kwargs): return dict(*args, **kwargs) @@ -329,20 +329,16 @@ safe_builtins['sum'] = guarded_sum def load_module(module, mname, mnameparts, validate, globals, locals): -modules = sys.modules while mnameparts: nextname = mnameparts.pop(0) if mname is None: mname = nextname else: mname = '%s.%s' % (mname, nextname) -nextmodule = modules.get(mname, None) -if nextmodule is None: -nextmodule = secureModule(mname, globals, locals) -if nextmodule is None: -return -else: -secureModule(mname) +# import (if not already imported) and check for MSI +nextmodule = secureModule(mname, globals, locals) +if nextmodule is None: # not allowed +return if module and not validate(module, module, nextname, nextmodule): return module = nextmodule @@ -440,7 +436,7 @@ def __idiv__(x, y): x /= y return x - + def __ifloordiv__(x, y): x //= y return x Modified: Zope/branches/2.12/src/AccessControl/__init__.py === --- Zope/branches/2.12/src/AccessControl/__init__.py2012-09-09 11:13:26 UTC (rev 127791) +++ Zope/branches/2.12/src/AccessControl/__init__.py2012-09-09 12:55:26 UTC (rev 127792) @@ -26,11 +26,18 @@ from AccessControl.SecurityInfo import allow_module from AccessControl.SecurityInfo import allow_class from AccessControl.SimpleObjectPolicies import allow_type -from AccessControl.unauthorized import Unauthorized # XXX +from AccessControl.unauthorized import Unauthorized from AccessControl.ZopeGuards import full_write_guard from AccessControl.ZopeGuards import safe_builtins ModuleSecurityInfo('AccessControl').declarePublic('getSecurityManager') +# allow imports of utility_builtins + +for name in ('string', 'math', 'random', 'sets'): +ModuleSecurityInfo(name).set
[Zope-Checkins] SVN: Zope/tags/2.12.24/ tagged
Log message for revision 127793: tagged Changed: A Zope/tags/2.12.24/ -=- ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/2.12/ vb
Log message for revision 127794: vb Changed: U Zope/branches/2.12/doc/CHANGES.rst U Zope/branches/2.12/setup.py -=- Modified: Zope/branches/2.12/doc/CHANGES.rst === --- Zope/branches/2.12/doc/CHANGES.rst 2012-09-09 12:56:10 UTC (rev 127793) +++ Zope/branches/2.12/doc/CHANGES.rst 2012-09-09 12:57:48 UTC (rev 127794) @@ -5,6 +5,10 @@ Change information for previous versions of Zope can be found at http://docs.zope.org/zope2/releases/. +2.12.25 (unreleased) + + + 2.12.24 (2012-09-09) Modified: Zope/branches/2.12/setup.py === --- Zope/branches/2.12/setup.py 2012-09-09 12:56:10 UTC (rev 127793) +++ Zope/branches/2.12/setup.py 2012-09-09 12:57:48 UTC (rev 127794) @@ -16,7 +16,7 @@ from setuptools import setup, find_packages, Extension setup(name='Zope2', -version='2.12.24', +version='2.12.25dev', url='http://www.zope.org', license='ZPL 2.1', description='Zope2 application server / web framework', ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/tags/2.12.24/versions.cfg forgot to update versions.cfg
Log message for revision 127795: forgot to update versions.cfg Changed: U Zope/tags/2.12.24/versions.cfg -=- Modified: Zope/tags/2.12.24/versions.cfg === --- Zope/tags/2.12.24/versions.cfg 2012-09-09 12:57:48 UTC (rev 127794) +++ Zope/tags/2.12.24/versions.cfg 2012-09-09 13:00:30 UTC (rev 127795) @@ -2,7 +2,7 @@ versions = versions [versions] -Zope2 = +Zope2 = 2.12.24 Acquisition = 2.13.8 buildout.dumppickedversions = 0.4 ClientForm = 0.2.10 ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/2.13/ AccessControl = 2.13.10
Log message for revision 127802: AccessControl = 2.13.10 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 2012-09-09 13:04:50 UTC (rev 127801) +++ Zope/branches/2.13/doc/CHANGES.rst 2012-09-09 13:05:37 UTC (rev 127802) @@ -10,7 +10,7 @@ - Updated distributions: - - AccessControl = 2.13.9 + - AccessControl = 2.13.10 - Products.PythonScripts = 2.13.2 2.13.16 (2012-08-11) Modified: Zope/branches/2.13/versions.cfg === --- Zope/branches/2.13/versions.cfg 2012-09-09 13:04:50 UTC (rev 127801) +++ Zope/branches/2.13/versions.cfg 2012-09-09 13:05:37 UTC (rev 127802) @@ -5,7 +5,7 @@ [versions] # Zope2-specific Zope2 = -AccessControl = 2.13.9 +AccessControl = 2.13.10 Acquisition = 2.13.8 DateTime = 2.12.7 DocumentTemplate = 2.13.2 ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/trunk/ AccessControl = 3.0.4
Log message for revision 127803: AccessControl = 3.0.4 Changed: U Zope/trunk/doc/CHANGES.rst U Zope/trunk/versions.cfg -=- Modified: Zope/trunk/doc/CHANGES.rst === --- Zope/trunk/doc/CHANGES.rst 2012-09-09 13:05:37 UTC (rev 127802) +++ Zope/trunk/doc/CHANGES.rst 2012-09-09 13:05:58 UTC (rev 127803) @@ -62,7 +62,7 @@ - Updated distributions: - - AccessControl = 3.0.3 + - AccessControl = 3.0.4 - Acquisition = 4.0a1 - DateTime = 3.0 - ExtensionClass = 4.0a1 Modified: Zope/trunk/versions.cfg === --- Zope/trunk/versions.cfg 2012-09-09 13:05:37 UTC (rev 127802) +++ Zope/trunk/versions.cfg 2012-09-09 13:05:58 UTC (rev 127803) @@ -5,7 +5,7 @@ [versions] # Zope2-specific Zope2 = -AccessControl = 3.0.3 +AccessControl = 3.0.4 Acquisition = 4.0a1 DateTime = 3.0 DocumentTemplate = 2.13.2 ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/2.13/ prepare
Log message for revision 127804: prepare 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 2012-09-09 13:05:58 UTC (rev 127803) +++ Zope/branches/2.13/doc/CHANGES.rst 2012-09-09 13:09:52 UTC (rev 127804) @@ -5,7 +5,7 @@ Change information for previous versions of Zope can be found at http://docs.zope.org/zope2/releases/. -2.13.17 (unreleased) +2.13.17 (2012-09-09) - Updated distributions: Modified: Zope/branches/2.13/setup.py === --- Zope/branches/2.13/setup.py 2012-09-09 13:05:58 UTC (rev 127803) +++ Zope/branches/2.13/setup.py 2012-09-09 13:09:52 UTC (rev 127804) @@ -23,7 +23,7 @@ setup(name='Zope2', -version='2.13.17dev', +version='2.13.17', 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 2012-09-09 13:05:58 UTC (rev 127803) +++ Zope/branches/2.13/versions.cfg 2012-09-09 13:09:52 UTC (rev 127804) @@ -4,7 +4,7 @@ [versions] # Zope2-specific -Zope2 = +Zope2 = 2.13.17 AccessControl = 2.13.10 Acquisition = 2.13.8 DateTime = 2.12.7 ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/tags/2.13.17/ tagged
Log message for revision 127805: tagged Changed: A Zope/tags/2.13.17/ -=- ___ 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 127806: 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 2012-09-09 13:10:30 UTC (rev 127805) +++ Zope/branches/2.13/doc/CHANGES.rst 2012-09-09 13:12:08 UTC (rev 127806) @@ -5,6 +5,10 @@ Change information for previous versions of Zope can be found at http://docs.zope.org/zope2/releases/. +2.13.18 (unreleased) + + + 2.13.17 (2012-09-09) Modified: Zope/branches/2.13/setup.py === --- Zope/branches/2.13/setup.py 2012-09-09 13:10:30 UTC (rev 127805) +++ Zope/branches/2.13/setup.py 2012-09-09 13:12:08 UTC (rev 127806) @@ -23,7 +23,7 @@ setup(name='Zope2', -version='2.13.17', +version='2.13.18dev', 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 2012-09-09 13:10:30 UTC (rev 127805) +++ Zope/branches/2.13/versions.cfg 2012-09-09 13:12:08 UTC (rev 127806) @@ -4,7 +4,7 @@ [versions] # Zope2-specific -Zope2 = 2.13.17 +Zope2 = AccessControl = 2.13.10 Acquisition = 2.13.8 DateTime = 2.12.7 ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/2.12/ prepare
Log message for revision 127857: prepare Changed: U Zope/branches/2.12/doc/CHANGES.rst U Zope/branches/2.12/setup.py U Zope/branches/2.12/versions.cfg -=- Modified: Zope/branches/2.12/doc/CHANGES.rst === --- Zope/branches/2.12/doc/CHANGES.rst 2012-09-17 21:16:44 UTC (rev 127856) +++ Zope/branches/2.12/doc/CHANGES.rst 2012-09-18 11:22:32 UTC (rev 127857) @@ -5,7 +5,7 @@ Change information for previous versions of Zope can be found at http://docs.zope.org/zope2/releases/. -2.12.25 (unreleased) +2.12.25 (2012-09-18) - Explicitly declared ZTUtils APIs as public (repairs breakages in apps Modified: Zope/branches/2.12/setup.py === --- Zope/branches/2.12/setup.py 2012-09-17 21:16:44 UTC (rev 127856) +++ Zope/branches/2.12/setup.py 2012-09-18 11:22:32 UTC (rev 127857) @@ -16,7 +16,7 @@ from setuptools import setup, find_packages, Extension setup(name='Zope2', -version='2.12.25dev', +version='2.12.25', url='http://www.zope.org', license='ZPL 2.1', description='Zope2 application server / web framework', Modified: Zope/branches/2.12/versions.cfg === --- Zope/branches/2.12/versions.cfg 2012-09-17 21:16:44 UTC (rev 127856) +++ Zope/branches/2.12/versions.cfg 2012-09-18 11:22:32 UTC (rev 127857) @@ -2,7 +2,7 @@ versions = versions [versions] -Zope2 = +Zope2 = 2.12.25 Acquisition = 2.13.8 buildout.dumppickedversions = 0.4 ClientForm = 0.2.10 ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/tags/2.12.25/ tagged
Log message for revision 127858: tagged Changed: A Zope/tags/2.12.25/ -=- ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/2.13/ prepare
Log message for revision 127859: prepare 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 2012-09-18 11:23:09 UTC (rev 127858) +++ Zope/branches/2.13/doc/CHANGES.rst 2012-09-18 11:24:27 UTC (rev 127859) @@ -5,7 +5,7 @@ Change information for previous versions of Zope can be found at http://docs.zope.org/zope2/releases/. -2.13.18 (unreleased) +2.13.18 (2012-09-18) - Explicitly declared ZTUtils APIs as public (repairs breakages in apps Modified: Zope/branches/2.13/setup.py === --- Zope/branches/2.13/setup.py 2012-09-18 11:23:09 UTC (rev 127858) +++ Zope/branches/2.13/setup.py 2012-09-18 11:24:27 UTC (rev 127859) @@ -23,7 +23,7 @@ setup(name='Zope2', -version='2.13.18dev', +version='2.13.18', 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 2012-09-18 11:23:09 UTC (rev 127858) +++ Zope/branches/2.13/versions.cfg 2012-09-18 11:24:27 UTC (rev 127859) @@ -4,7 +4,7 @@ [versions] # Zope2-specific -Zope2 = +Zope2 = 2.13.18 AccessControl = 2.13.10 Acquisition = 2.13.8 DateTime = 2.12.7 ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/tags/2.13.18/ tagged
Log message for revision 127860: tagged Changed: A Zope/tags/2.13.18/ -=- ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/2.12/ vb
Log message for revision 127861: vb Changed: U Zope/branches/2.12/doc/CHANGES.rst U Zope/branches/2.12/setup.py U Zope/branches/2.12/versions.cfg -=- Modified: Zope/branches/2.12/doc/CHANGES.rst === --- Zope/branches/2.12/doc/CHANGES.rst 2012-09-18 11:24:57 UTC (rev 127860) +++ Zope/branches/2.12/doc/CHANGES.rst 2012-09-18 11:30:51 UTC (rev 127861) @@ -5,6 +5,10 @@ Change information for previous versions of Zope can be found at http://docs.zope.org/zope2/releases/. +2.12.26 (unreleased) + + + 2.12.25 (2012-09-18) Modified: Zope/branches/2.12/setup.py === --- Zope/branches/2.12/setup.py 2012-09-18 11:24:57 UTC (rev 127860) +++ Zope/branches/2.12/setup.py 2012-09-18 11:30:51 UTC (rev 127861) @@ -16,7 +16,7 @@ from setuptools import setup, find_packages, Extension setup(name='Zope2', -version='2.12.25', +version='2.12.26dev', url='http://www.zope.org', license='ZPL 2.1', description='Zope2 application server / web framework', Modified: Zope/branches/2.12/versions.cfg === --- Zope/branches/2.12/versions.cfg 2012-09-18 11:24:57 UTC (rev 127860) +++ Zope/branches/2.12/versions.cfg 2012-09-18 11:30:51 UTC (rev 127861) @@ -2,7 +2,7 @@ versions = versions [versions] -Zope2 = 2.12.25 +Zope2 = Acquisition = 2.13.8 buildout.dumppickedversions = 0.4 ClientForm = 0.2.10 ___ 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 127863: 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 2012-09-18 11:31:54 UTC (rev 127862) +++ Zope/branches/2.13/doc/CHANGES.rst 2012-09-18 11:36:49 UTC (rev 127863) @@ -5,6 +5,10 @@ Change information for previous versions of Zope can be found at http://docs.zope.org/zope2/releases/. +2.13.19 (unreleased) + + + 2.13.18 (2012-09-18) Modified: Zope/branches/2.13/setup.py === --- Zope/branches/2.13/setup.py 2012-09-18 11:31:54 UTC (rev 127862) +++ Zope/branches/2.13/setup.py 2012-09-18 11:36:49 UTC (rev 127863) @@ -23,7 +23,7 @@ setup(name='Zope2', -version='2.13.18', +version='2.13.19dev', 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 2012-09-18 11:31:54 UTC (rev 127862) +++ Zope/branches/2.13/versions.cfg 2012-09-18 11:36:49 UTC (rev 127863) @@ -4,7 +4,7 @@ [versions] # Zope2-specific -Zope2 = 2.13.18 +Zope2 = AccessControl = 2.13.10 Acquisition = 2.13.8 DateTime = 2.12.7 ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/trunk/ datetime 3.0.1
Log message for revision 127876: datetime 3.0.1 Changed: U Zope/trunk/doc/CHANGES.rst U Zope/trunk/versions.cfg -=- Modified: Zope/trunk/doc/CHANGES.rst === --- Zope/trunk/doc/CHANGES.rst 2012-09-23 16:12:45 UTC (rev 127875) +++ Zope/trunk/doc/CHANGES.rst 2012-09-23 16:14:55 UTC (rev 127876) @@ -64,7 +64,7 @@ - AccessControl = 3.0.4 - Acquisition = 4.0a1 - - DateTime = 3.0 + - DateTime = 3.0.1 - ExtensionClass = 4.0a1 - docutils = 0.8.1 - manuel = 1.5.0 Modified: Zope/trunk/versions.cfg === --- Zope/trunk/versions.cfg 2012-09-23 16:12:45 UTC (rev 127875) +++ Zope/trunk/versions.cfg 2012-09-23 16:14:55 UTC (rev 127876) @@ -7,7 +7,7 @@ Zope2 = AccessControl = 3.0.4 Acquisition = 4.0a1 -DateTime = 3.0 +DateTime = 3.0.1 DocumentTemplate = 2.13.2 ExtensionClass = 4.0a1 initgroups = 2.13.0 ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/2.13/ Revert r127986 - tempstorage is an actual dependency of Products.TemporaryStorage
Log message for revision 127987: Revert r127986 - tempstorage is an actual dependency of Products.TemporaryStorage Changed: U Zope/branches/2.13/buildout.cfg U Zope/branches/2.13/setup.py -=- Modified: Zope/branches/2.13/buildout.cfg === --- Zope/branches/2.13/buildout.cfg 2012-10-13 19:45:24 UTC (rev 127986) +++ Zope/branches/2.13/buildout.cfg 2012-10-14 09:19:32 UTC (rev 127987) @@ -30,7 +30,7 @@ import sys import warnings if sys.version_info >= (2, 7): warnings.simplefilter('default') -eggs = Zope2 [test] +eggs = Zope2 [scripts] Modified: Zope/branches/2.13/setup.py === --- Zope/branches/2.13/setup.py 2012-10-13 19:45:24 UTC (rev 127986) +++ Zope/branches/2.13/setup.py 2012-10-14 09:19:32 UTC (rev 127987) @@ -65,6 +65,7 @@ 'initgroups', 'pytz', 'setuptools', + 'tempstorage', 'transaction', 'zdaemon', 'zExceptions', @@ -112,9 +113,7 @@ 'Products.PythonScripts', 'Products.StandardCacheManagers', ] + additional_install_requires, -extras_require={ - 'test': ['tempstorage'], -}, + include_package_data=True, zip_safe=False, entry_points={ ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/trunk/ Revert r127985 - tempstorage is an actual dependency of Products.TemporaryFolder
Log message for revision 127988: Revert r127985 - tempstorage is an actual dependency of Products.TemporaryFolder Changed: U Zope/trunk/buildout.cfg U Zope/trunk/setup.py -=- Modified: Zope/trunk/buildout.cfg === --- Zope/trunk/buildout.cfg 2012-10-14 09:19:32 UTC (rev 127987) +++ Zope/trunk/buildout.cfg 2012-10-14 09:21:40 UTC (rev 127988) @@ -31,7 +31,7 @@ import sys import warnings if sys.version_info >= (2, 7): warnings.simplefilter('default') -eggs = Zope2 [test] +eggs = Zope2 [scripts] Modified: Zope/trunk/setup.py === --- Zope/trunk/setup.py 2012-10-14 09:19:32 UTC (rev 127987) +++ Zope/trunk/setup.py 2012-10-14 09:21:40 UTC (rev 127988) @@ -65,6 +65,7 @@ 'initgroups', 'pytz', 'setuptools', + 'tempstorage', 'transaction', 'zdaemon', 'zExceptions', @@ -105,9 +106,7 @@ 'zope.traversing', 'zope.viewlet', ] + additional_install_requires, -extras_require={ - 'test': ['tempstorage'], -}, + include_package_data=True, zip_safe=False, entry_points={ ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/2.13/ tempstorage = 2.12.2
Log message for revision 127994: tempstorage = 2.12.2 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 2012-10-14 11:54:46 UTC (rev 127993) +++ Zope/branches/2.13/doc/CHANGES.rst 2012-10-14 12:01:46 UTC (rev 127994) @@ -8,7 +8,10 @@ 2.13.19 (unreleased) +- Updated distributions: + - tempstorage = 2.12.2 + 2.13.18 (2012-09-18) Modified: Zope/branches/2.13/versions.cfg === --- Zope/branches/2.13/versions.cfg 2012-10-14 11:54:46 UTC (rev 127993) +++ Zope/branches/2.13/versions.cfg 2012-10-14 12:01:46 UTC (rev 127994) @@ -25,7 +25,7 @@ Products.ZCatalog = 2.13.23 Products.ZCTextIndex = 2.13.3 Record = 2.13.0 -tempstorage = 2.12.1 +tempstorage = 2.12.2 zExceptions = 2.13.0 zLOG = 2.11.1 ZopeUndo = 2.12.0 ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/trunk/versions.cfg tempstorage = 2.12.2
Log message for revision 127995: tempstorage = 2.12.2 Changed: U Zope/trunk/versions.cfg -=- Modified: Zope/trunk/versions.cfg === --- Zope/trunk/versions.cfg 2012-10-14 12:01:46 UTC (rev 127994) +++ Zope/trunk/versions.cfg 2012-10-14 12:02:49 UTC (rev 127995) @@ -19,7 +19,7 @@ Products.ZCatalog = 3.0a2 Products.ZCTextIndex = 2.13.3 Record = 2.13.0 -tempstorage = 2.12.1 +tempstorage = 2.12.2 zExceptions = 2.13.0 zLOG = 2.12.0 ZopeUndo = 2.12.0 ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/2.12/ LP #930812: Scrub headers a bit more.
Log message for revision 127996: LP #930812: Scrub headers a bit more. Changed: U Zope/branches/2.12/doc/CHANGES.rst U Zope/branches/2.12/src/ZPublisher/HTTPResponse.py U Zope/branches/2.12/src/ZPublisher/tests/testHTTPResponse.py -=- Modified: Zope/branches/2.12/doc/CHANGES.rst === --- Zope/branches/2.12/doc/CHANGES.rst 2012-10-14 12:02:49 UTC (rev 127995) +++ Zope/branches/2.12/doc/CHANGES.rst 2012-10-14 12:38:50 UTC (rev 127996) @@ -8,6 +8,7 @@ 2.12.26 (unreleased) +- LP #930812: Scrub headers a bit more. 2.12.25 (2012-09-18) @@ -15,7 +16,6 @@ - Explicitly declared ZTUtils APIs as public (repairs breakages in apps following fix for LP #1047318). - 2.12.24 (2012-09-09) Modified: Zope/branches/2.12/src/ZPublisher/HTTPResponse.py === --- Zope/branches/2.12/src/ZPublisher/HTTPResponse.py 2012-10-14 12:02:49 UTC (rev 127995) +++ Zope/branches/2.12/src/ZPublisher/HTTPResponse.py 2012-10-14 12:38:50 UTC (rev 127996) @@ -125,7 +125,7 @@ if otherTypes: uncompressableMimeMajorTypes += tuple(otherTypes.split(',')) -_CRLF = re.compile(r'\r[\n]?') +_CRLF = re.compile(r'[\r\n]') def _scrubHeader(name, value): return ''.join(_CRLF.split(str(name))), ''.join(_CRLF.split(str(value))) Modified: Zope/branches/2.12/src/ZPublisher/tests/testHTTPResponse.py === --- Zope/branches/2.12/src/ZPublisher/tests/testHTTPResponse.py 2012-10-14 12:02:49 UTC (rev 127995) +++ Zope/branches/2.12/src/ZPublisher/tests/testHTTPResponse.py 2012-10-14 12:38:50 UTC (rev 127996) @@ -303,6 +303,15 @@ 'Set-Cookie: ' 'violation="http://www.ietf.org/rfc/rfc2616.txt"\r\n') +def test_setHeader_drops_LF(self): +# Some browsers accept \n in place of \n\r to separate headers, +# so we scrub it too. +response = self._makeOne() +response.setHeader('Location', + 'http://www.ietf.org/rfc/\nrfc2616.txt') +self.assertEqual(response.headers['location'], + 'http://www.ietf.org/rfc/rfc2616.txt') + def test_setBody_compression_vary(self): # Vary header should be added here response = self._makeOne() ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/2.13/ LP #930812: Scrub headers a bit more.
Log message for revision 127997: LP #930812: Scrub headers a bit more. Changed: U Zope/branches/2.13/doc/CHANGES.rst U Zope/branches/2.13/src/ZPublisher/HTTPResponse.py U Zope/branches/2.13/src/ZPublisher/tests/testHTTPResponse.py -=- Modified: Zope/branches/2.13/doc/CHANGES.rst === --- Zope/branches/2.13/doc/CHANGES.rst 2012-10-14 12:38:50 UTC (rev 127996) +++ Zope/branches/2.13/doc/CHANGES.rst 2012-10-14 12:43:43 UTC (rev 127997) @@ -8,6 +8,8 @@ 2.13.19 (unreleased) +- LP #930812: Scrub headers a bit more. + - Updated distributions: - tempstorage = 2.12.2 Modified: Zope/branches/2.13/src/ZPublisher/HTTPResponse.py === --- Zope/branches/2.13/src/ZPublisher/HTTPResponse.py 2012-10-14 12:38:50 UTC (rev 127996) +++ Zope/branches/2.13/src/ZPublisher/HTTPResponse.py 2012-10-14 12:43:43 UTC (rev 127997) @@ -128,7 +128,7 @@ if otherTypes: uncompressableMimeMajorTypes += tuple(otherTypes.split(',')) -_CRLF = re.compile(r'\r[\n]?') +_CRLF = re.compile(r'[\r\n]') def _scrubHeader(name, value): return ''.join(_CRLF.split(str(name))), ''.join(_CRLF.split(str(value))) Modified: Zope/branches/2.13/src/ZPublisher/tests/testHTTPResponse.py === --- Zope/branches/2.13/src/ZPublisher/tests/testHTTPResponse.py 2012-10-14 12:38:50 UTC (rev 127996) +++ Zope/branches/2.13/src/ZPublisher/tests/testHTTPResponse.py 2012-10-14 12:43:43 UTC (rev 127997) @@ -431,6 +431,15 @@ ('Set-Cookie', 'violation="http://www.ietf.org/rfc/rfc2616.txt";')]) +def test_setHeader_drops_LF(self): +# Some browsers accept \n in place of \n\r to separate headers, +# so we scrub it too. +response = self._makeOne() +response.setHeader('Location', + 'http://www.ietf.org/rfc/\nrfc2616.txt') +self.assertEqual(response.headers['location'], + 'http://www.ietf.org/rfc/rfc2616.txt') + def test_appendHeader_no_existing(self): response = self._makeOne() response.appendHeader('foo', 'foo') ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/trunk/src/ZPublisher/ - LP #930812: Scrub headers a bit more.
Log message for revision 127998: - LP #930812: Scrub headers a bit more. Changed: U Zope/trunk/src/ZPublisher/HTTPResponse.py U Zope/trunk/src/ZPublisher/tests/testHTTPResponse.py -=- Modified: Zope/trunk/src/ZPublisher/HTTPResponse.py === --- Zope/trunk/src/ZPublisher/HTTPResponse.py 2012-10-14 12:43:43 UTC (rev 127997) +++ Zope/trunk/src/ZPublisher/HTTPResponse.py 2012-10-14 12:46:17 UTC (rev 127998) @@ -128,7 +128,7 @@ if otherTypes: uncompressableMimeMajorTypes += tuple(otherTypes.split(',')) -_CRLF = re.compile(r'\r[\n]?') +_CRLF = re.compile(r'[\r\n]') def _scrubHeader(name, value): return ''.join(_CRLF.split(str(name))), ''.join(_CRLF.split(str(value))) Modified: Zope/trunk/src/ZPublisher/tests/testHTTPResponse.py === --- Zope/trunk/src/ZPublisher/tests/testHTTPResponse.py 2012-10-14 12:43:43 UTC (rev 127997) +++ Zope/trunk/src/ZPublisher/tests/testHTTPResponse.py 2012-10-14 12:46:17 UTC (rev 127998) @@ -409,6 +409,15 @@ self.assertEqual(response.headers['location'], 'http://www.ietf.org/rfc/rfc2616.txt') +def test_setHeader_drops_LF(self): +# Some browsers accept \n in place of \n\r to separate headers, +# so we scrub it too. +response = self._makeOne() +response.setHeader('Location', + 'http://www.ietf.org/rfc/\nrfc2616.txt') +self.assertEqual(response.headers['location'], + 'http://www.ietf.org/rfc/rfc2616.txt') + def test_appendHeader_no_existing(self): response = self._makeOne() response.appendHeader('foo', 'foo') ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/2.13/ Backport c122072 from trunk - close databases on shutdown to write out .index file
Log message for revision 128100: Backport c122072 from trunk - close databases on shutdown to write out .index file Changed: U Zope/branches/2.13/doc/CHANGES.rst U Zope/branches/2.13/src/Zope2/App/startup.py U Zope/branches/2.13/src/Zope2/Startup/__init__.py -=- Modified: Zope/branches/2.13/doc/CHANGES.rst === --- Zope/branches/2.13/doc/CHANGES.rst 2012-10-21 15:57:56 UTC (rev 128099) +++ Zope/branches/2.13/doc/CHANGES.rst 2012-10-21 17:28:54 UTC (rev 128100) @@ -8,12 +8,15 @@ 2.13.19 (unreleased) -- LP #930812: Scrub headers a bit more. - - Updated distributions: - tempstorage = 2.12.2 +- Explicitly close all databases on shutdown, which ensures `Data.fs.index` + gets written to the file system. + +- LP #930812: Scrub headers a bit more. + - Fix lock and pid file handling on Windows. On other platforms starting Zope tolerated existing or locked files, this now also works on Windows. Modified: Zope/branches/2.13/src/Zope2/App/startup.py === --- Zope/branches/2.13/src/Zope2/App/startup.py 2012-10-21 15:57:56 UTC (rev 128099) +++ Zope/branches/2.13/src/Zope2/App/startup.py 2012-10-21 17:28:54 UTC (rev 128100) @@ -76,7 +76,7 @@ m=imp.find_module('custom_zodb',[configuration.testinghome]) except: m=imp.find_module('custom_zodb',[configuration.instancehome]) -except: +except Exception: # if there is no custom_zodb, use the config file specified databases DB = dbtab.getDatabase('/', is_root=1) else: Modified: Zope/branches/2.13/src/Zope2/Startup/__init__.py === --- Zope/branches/2.13/src/Zope2/Startup/__init__.py2012-10-21 15:57:56 UTC (rev 128099) +++ Zope/branches/2.13/src/Zope2/Startup/__init__.py2012-10-21 17:28:54 UTC (rev 128100) @@ -108,6 +108,9 @@ self.shutdown() def shutdown(self): +databases = getattr(self.cfg.dbtab, 'databases', {}) +for db in databases.values(): +db.close() self.unlinkLockFile() self.unlinkPidFile() ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/2.13/ AccessControl = 2.13.11
Log message for revision 128107: AccessControl = 2.13.11 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 2012-10-21 17:33:38 UTC (rev 128106) +++ Zope/branches/2.13/doc/CHANGES.rst 2012-10-21 17:34:35 UTC (rev 128107) @@ -10,6 +10,7 @@ - Updated distributions: + - AccessControl = 2.13.11 - tempstorage = 2.12.2 - Explicitly close all databases on shutdown, which ensures `Data.fs.index` Modified: Zope/branches/2.13/versions.cfg === --- Zope/branches/2.13/versions.cfg 2012-10-21 17:33:38 UTC (rev 128106) +++ Zope/branches/2.13/versions.cfg 2012-10-21 17:34:35 UTC (rev 128107) @@ -5,7 +5,7 @@ [versions] # Zope2-specific Zope2 = -AccessControl = 2.13.10 +AccessControl = 2.13.11 Acquisition = 2.13.8 DateTime = 2.12.7 DocumentTemplate = 2.13.2 ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/trunk/versions.cfg AccessControl = 3.0.5
Log message for revision 128108: AccessControl = 3.0.5 Changed: U Zope/trunk/versions.cfg -=- Modified: Zope/trunk/versions.cfg === --- Zope/trunk/versions.cfg 2012-10-21 17:34:35 UTC (rev 128107) +++ Zope/trunk/versions.cfg 2012-10-21 17:34:54 UTC (rev 128108) @@ -5,7 +5,7 @@ [versions] # Zope2-specific Zope2 = -AccessControl = 3.0.4 +AccessControl = 3.0.5 Acquisition = 4.0a1 DateTime = 3.0.1 DocumentTemplate = 2.13.2 ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/2.13/ update some more KGS versions
Log message for revision 128109: update some more KGS versions 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 2012-10-21 17:34:54 UTC (rev 128108) +++ Zope/branches/2.13/doc/CHANGES.rst 2012-10-21 17:39:36 UTC (rev 128109) @@ -11,6 +11,11 @@ - Updated distributions: - AccessControl = 2.13.11 + - distribute = 0.6.29 + - mr.developer = 1.22 + - pytz = 2012g + - repoze.retry = 1.2 + - repoze.tm2 = 1.0 - tempstorage = 2.12.2 - Explicitly close all databases on shutdown, which ensures `Data.fs.index` Modified: Zope/branches/2.13/versions.cfg === --- Zope/branches/2.13/versions.cfg 2012-10-21 17:34:54 UTC (rev 128108) +++ Zope/branches/2.13/versions.cfg 2012-10-21 17:39:36 UTC (rev 128109) @@ -38,13 +38,13 @@ ZODB3 = 3.10.5 # ZTK 1.0.8 backports -distribute = 0.6.28 -mr.developer = 1.21 +distribute = 0.6.29 +mr.developer = 1.22 zdaemon = 2.0.7 -pytz = 2012d +pytz = 2012g # Zope2 dependencies -repoze.retry = 1.0 -repoze.tm2 = 1.0b2 +repoze.retry = 1.2 +repoze.tm2 = 1.0 repoze.who = 2.0 zope.testbrowser = 3.11.1 ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/trunk/ some more KGS version updates
Log message for revision 128110: some more KGS version updates Changed: U Zope/trunk/doc/CHANGES.rst U Zope/trunk/versions.cfg -=- Modified: Zope/trunk/doc/CHANGES.rst === --- Zope/trunk/doc/CHANGES.rst 2012-10-21 17:39:36 UTC (rev 128109) +++ Zope/trunk/doc/CHANGES.rst 2012-10-21 17:45:17 UTC (rev 128110) @@ -71,7 +71,7 @@ - Updated distributions: - - AccessControl = 3.0.4 + - AccessControl = 3.0.5 - Acquisition = 4.0a1 - DateTime = 3.0.1 - ExtensionClass = 4.0a1 Modified: Zope/trunk/versions.cfg === --- Zope/trunk/versions.cfg 2012-10-21 17:39:36 UTC (rev 128109) +++ Zope/trunk/versions.cfg 2012-10-21 17:45:17 UTC (rev 128110) @@ -32,12 +32,14 @@ Products.StandardCacheManagers = 2.13.0 # ZTK KGS overrides -docutils = 0.8.1 -manuel = 1.5.0 +distribute = 0.6.29 +docutils = 0.9.1 +manuel = 1.6.0 +mr.developer = 1.22 python-gettext = 1.2 # Zope2 dependencies -repoze.retry = 1.0 -repoze.tm2 = 1.0b1 +repoze.retry = 1.2 +repoze.tm2 = 1.0 repoze.who = 2.0 zope.testbrowser = 3.11.1 ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/trunk/ DateTime = 3.0.2
Log message for revision 128115: DateTime = 3.0.2 Changed: U Zope/trunk/doc/CHANGES.rst U Zope/trunk/versions.cfg -=- Modified: Zope/trunk/doc/CHANGES.rst === --- Zope/trunk/doc/CHANGES.rst 2012-10-21 19:42:04 UTC (rev 128114) +++ Zope/trunk/doc/CHANGES.rst 2012-10-21 19:42:30 UTC (rev 128115) @@ -73,7 +73,7 @@ - AccessControl = 3.0.5 - Acquisition = 4.0a1 - - DateTime = 3.0.1 + - DateTime = 3.0.2 - ExtensionClass = 4.0a1 - docutils = 0.8.1 - manuel = 1.5.0 Modified: Zope/trunk/versions.cfg === --- Zope/trunk/versions.cfg 2012-10-21 19:42:04 UTC (rev 128114) +++ Zope/trunk/versions.cfg 2012-10-21 19:42:30 UTC (rev 128115) @@ -7,7 +7,7 @@ Zope2 = AccessControl = 3.0.5 Acquisition = 4.0a1 -DateTime = 3.0.1 +DateTime = 3.0.2 DocumentTemplate = 2.13.2 ExtensionClass = 4.0a1 initgroups = 2.13.0 ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/2.13/ LP #1058049: Fix support for zoperunner section in zope.conf.
Log message for revision 128116: LP #1058049: Fix support for zoperunner section in zope.conf. Changed: U Zope/branches/2.13/doc/CHANGES.rst U Zope/branches/2.13/src/Zope2/Startup/zopectl.py -=- Modified: Zope/branches/2.13/doc/CHANGES.rst === --- Zope/branches/2.13/doc/CHANGES.rst 2012-10-21 19:42:30 UTC (rev 128115) +++ Zope/branches/2.13/doc/CHANGES.rst 2012-10-21 19:57:24 UTC (rev 128116) @@ -18,6 +18,8 @@ - repoze.tm2 = 1.0 - tempstorage = 2.12.2 +- LP #1058049: Fix support for zoperunner section in zope.conf. + - Explicitly close all databases on shutdown, which ensures `Data.fs.index` gets written to the file system. Modified: Zope/branches/2.13/src/Zope2/Startup/zopectl.py === --- Zope/branches/2.13/src/Zope2/Startup/zopectl.py 2012-10-21 19:42:30 UTC (rev 128115) +++ Zope/branches/2.13/src/Zope2/Startup/zopectl.py 2012-10-21 19:57:24 UTC (rev 128116) @@ -180,7 +180,8 @@ self.directory = config.instancehome self.clienthome = config.clienthome if self.program: -self.program = [self.program] +if isinstance(self.program, basestring): +self.program = [self.program] elif config.runner and config.runner.program: self.program = config.runner.program else: ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/trunk/src/Zope2/Startup/zopectl.py Merge c128116 from 2.13 branch
Log message for revision 128117: Merge c128116 from 2.13 branch Changed: U Zope/trunk/src/Zope2/Startup/zopectl.py -=- Modified: Zope/trunk/src/Zope2/Startup/zopectl.py === --- Zope/trunk/src/Zope2/Startup/zopectl.py 2012-10-21 19:57:24 UTC (rev 128116) +++ Zope/trunk/src/Zope2/Startup/zopectl.py 2012-10-21 19:59:29 UTC (rev 128117) @@ -180,7 +180,8 @@ self.directory = config.instancehome self.clienthome = config.clienthome if self.program: -self.program = [self.program] +if isinstance(self.program, basestring): +self.program = [self.program] elif config.runner and config.runner.program: self.program = config.runner.program else: ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/2.13/src/OFS/PropertyManager.py whitespace
Log message for revision 128118: whitespace Changed: U Zope/branches/2.13/src/OFS/PropertyManager.py -=- Modified: Zope/branches/2.13/src/OFS/PropertyManager.py === --- Zope/branches/2.13/src/OFS/PropertyManager.py 2012-10-21 19:59:29 UTC (rev 128117) +++ Zope/branches/2.13/src/OFS/PropertyManager.py 2012-10-21 20:05:22 UTC (rev 128118) @@ -272,7 +272,6 @@ dict[p['id']]=p return dict - # Web interface security.declareProtected(manage_properties, 'manage_addProperty') @@ -282,7 +281,7 @@ Sets a new property with the given id, type, and value. """ if type in type_converters: -value=type_converters[type](value) +value = type_converters[type](value) self._setProperty(id.strip(), value, type) if REQUEST is not None: return self.manage_propertiesForm(self, REQUEST) @@ -297,16 +296,16 @@ instead for most situations. """ for prop in self._propertyMap(): -name=prop['id'] +name = prop['id'] if 'w' in prop.get('mode', 'wd'): if prop['type'] == 'multiple selection': -value=REQUEST.get(name, []) +value = REQUEST.get(name, []) else: -value=REQUEST.get(name, '') +value = REQUEST.get(name, '') self._updateProperty(name, value) if REQUEST: -message="Saved changes." -return self.manage_propertiesForm(self,REQUEST, +message = "Saved changes." +return self.manage_propertiesForm(self, REQUEST, manage_tabs_message=message) security.declareProtected(manage_properties, 'manage_changeProperties') ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/2.13/ LP #1061247: Fix ZMI properties edit form for properties named `method`.
Log message for revision 128119: LP #1061247: Fix ZMI properties edit form for properties named `method`. Changed: U Zope/branches/2.13/doc/CHANGES.rst U Zope/branches/2.13/src/OFS/PropertyManager.py -=- Modified: Zope/branches/2.13/doc/CHANGES.rst === --- Zope/branches/2.13/doc/CHANGES.rst 2012-10-21 20:05:22 UTC (rev 128118) +++ Zope/branches/2.13/doc/CHANGES.rst 2012-10-21 20:12:27 UTC (rev 128119) @@ -18,6 +18,8 @@ - repoze.tm2 = 1.0 - tempstorage = 2.12.2 +- LP #1061247: Fix ZMI properties edit form for properties named `method`. + - LP #1058049: Fix support for zoperunner section in zope.conf. - Explicitly close all databases on shutdown, which ensures `Data.fs.index` Modified: Zope/branches/2.13/src/OFS/PropertyManager.py === --- Zope/branches/2.13/src/OFS/PropertyManager.py 2012-10-21 20:05:22 UTC (rev 128118) +++ Zope/branches/2.13/src/OFS/PropertyManager.py 2012-10-21 20:12:27 UTC (rev 128119) @@ -299,9 +299,9 @@ name = prop['id'] if 'w' in prop.get('mode', 'wd'): if prop['type'] == 'multiple selection': -value = REQUEST.get(name, []) +value = REQUEST.form.get(name, []) else: -value = REQUEST.get(name, '') +value = REQUEST.form.get(name, '') self._updateProperty(name, value) if REQUEST: message = "Saved changes." @@ -316,8 +316,11 @@ name=value parameters """ if REQUEST is None: -props={} -else: props=REQUEST +props = {} +elif isinstance(REQUEST, dict): +props = REQUEST +else: +props = REQUEST.form if kw: for name, value in kw.items(): props[name]=value ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/2.13/src/OFS/PropertyManager.py whitespace
Log message for revision 128120: whitespace Changed: U Zope/branches/2.13/src/OFS/PropertyManager.py -=- Modified: Zope/branches/2.13/src/OFS/PropertyManager.py === --- Zope/branches/2.13/src/OFS/PropertyManager.py 2012-10-21 20:12:27 UTC (rev 128119) +++ Zope/branches/2.13/src/OFS/PropertyManager.py 2012-10-21 20:13:07 UTC (rev 128120) @@ -323,16 +323,16 @@ props = REQUEST.form if kw: for name, value in kw.items(): -props[name]=value -propdict=self.propdict() +props[name] = value +propdict = self.propdict() for name, value in props.items(): if self.hasProperty(name): if not 'w' in propdict[name].get('mode', 'wd'): -raise BadRequest, '%s cannot be changed' % escape(name) +raise BadRequest('%s cannot be changed' % escape(name)) self._updateProperty(name, value) if REQUEST: -message="Saved changes." -return self.manage_propertiesForm(self,REQUEST, +message = "Saved changes." +return self.manage_propertiesForm(self, REQUEST, manage_tabs_message=message) # Note - this is experimental, pending some community input. ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/trunk/src/OFS/PropertyManager.py Merged r128118:128120 from 2.13 branch
Log message for revision 128121: Merged r128118:128120 from 2.13 branch Changed: U Zope/trunk/src/OFS/PropertyManager.py -=- Modified: Zope/trunk/src/OFS/PropertyManager.py === --- Zope/trunk/src/OFS/PropertyManager.py 2012-10-21 20:13:07 UTC (rev 128120) +++ Zope/trunk/src/OFS/PropertyManager.py 2012-10-21 20:15:40 UTC (rev 128121) @@ -269,7 +269,6 @@ dict[p['id']]=p return dict - # Web interface security.declareProtected(manage_properties, 'manage_addProperty') @@ -279,7 +278,7 @@ Sets a new property with the given id, type, and value. """ if type in type_converters: -value=type_converters[type](value) +value = type_converters[type](value) self._setProperty(id.strip(), value, type) if REQUEST is not None: return self.manage_propertiesForm(self, REQUEST) @@ -294,16 +293,16 @@ instead for most situations. """ for prop in self._propertyMap(): -name=prop['id'] +name = prop['id'] if 'w' in prop.get('mode', 'wd'): if prop['type'] == 'multiple selection': -value=REQUEST.get(name, []) +value = REQUEST.form.get(name, []) else: -value=REQUEST.get(name, '') +value = REQUEST.form.get(name, '') self._updateProperty(name, value) if REQUEST: -message="Saved changes." -return self.manage_propertiesForm(self,REQUEST, +message = "Saved changes." +return self.manage_propertiesForm(self, REQUEST, manage_tabs_message=message) security.declareProtected(manage_properties, 'manage_changeProperties') @@ -314,20 +313,23 @@ name=value parameters """ if REQUEST is None: -props={} -else: props=REQUEST +props = {} +elif isinstance(REQUEST, dict): +props = REQUEST +else: +props = REQUEST.form if kw: for name, value in kw.items(): -props[name]=value -propdict=self.propdict() +props[name] = value +propdict = self.propdict() for name, value in props.items(): if self.hasProperty(name): if not 'w' in propdict[name].get('mode', 'wd'): -raise BadRequest, '%s cannot be changed' % escape(name) +raise BadRequest('%s cannot be changed' % escape(name)) self._updateProperty(name, value) if REQUEST: -message="Saved changes." -return self.manage_propertiesForm(self,REQUEST, +message = "Saved changes." +return self.manage_propertiesForm(self, REQUEST, manage_tabs_message=message) # Note - this is experimental, pending some community input. ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/2.12/ LP #1071067: Use a stronger random number generator and a constant time comparison function.
Log message for revision 128158: LP #1071067: Use a stronger random number generator and a constant time comparison function. Changed: U Zope/branches/2.12/doc/CHANGES.rst U Zope/branches/2.12/setup.py U Zope/branches/2.12/src/AccessControl/AuthEncoding.py U Zope/branches/2.12/src/Products/Sessions/BrowserIdManager.py U Zope/branches/2.12/versions.cfg -=- Modified: Zope/branches/2.12/doc/CHANGES.rst === --- Zope/branches/2.12/doc/CHANGES.rst 2012-10-31 14:10:50 UTC (rev 128157) +++ Zope/branches/2.12/doc/CHANGES.rst 2012-10-31 14:13:07 UTC (rev 128158) @@ -5,9 +5,12 @@ Change information for previous versions of Zope can be found at http://docs.zope.org/zope2/releases/. -2.12.26 (unreleased) +2.12.26 (2012-10-31) +- LP #1071067: Use a stronger random number generator and a constant time + comparison function. + - LP #930812: Scrub headers a bit more. 2.12.25 (2012-09-18) Modified: Zope/branches/2.12/setup.py === --- Zope/branches/2.12/setup.py 2012-10-31 14:10:50 UTC (rev 128157) +++ Zope/branches/2.12/setup.py 2012-10-31 14:13:07 UTC (rev 128158) @@ -16,7 +16,7 @@ from setuptools import setup, find_packages, Extension setup(name='Zope2', -version='2.12.26dev', +version='2.12.26', url='http://www.zope.org', license='ZPL 2.1', description='Zope2 application server / web framework', Modified: Zope/branches/2.12/src/AccessControl/AuthEncoding.py === --- Zope/branches/2.12/src/AccessControl/AuthEncoding.py2012-10-31 14:10:50 UTC (rev 128157) +++ Zope/branches/2.12/src/AccessControl/AuthEncoding.py2012-10-31 14:13:07 UTC (rev 128158) @@ -11,18 +11,59 @@ # ## -__version__='$Revision: 1.9 $'[11:-2] +import binascii +from binascii import b2a_base64, a2b_base64 +from hashlib import sha1 as sha +from hashlib import sha256 +from os import getpid +import time +# Use the system PRNG if possible +import random try: -from hashlib import sha1 as sha -except: -from sha import new as sha +random = random.SystemRandom() +using_sysrandom = True +except NotImplementedError: +using_sysrandom = False -import binascii -from binascii import b2a_base64, a2b_base64 -from random import choice, randrange +def _reseed(): +if not using_sysrandom: +# This is ugly, and a hack, but it makes things better than +# the alternative of predictability. This re-seeds the PRNG +# using a value that is hard for an attacker to predict, every +# time a random string is required. This may change the +# properties of the chosen random sequence slightly, but this +# is better than absolute predictability. +random.seed(sha256( +"%s%s%s" % (random.getstate(), time.time(), getpid()) +).digest()) + +def _choice(c): +_reseed() +return random.choice(c) + + +def _randrange(r): +_reseed() +return random.randrange(r) + + +def constant_time_compare(val1, val2): +""" +Returns True if the two strings are equal, False otherwise. + +The time taken is independent of the number of characters that match. +""" +if len(val1) != len(val2): +return False +result = 0 +for x, y in zip(val1, val2): +result |= ord(x) ^ ord(y) +return result == 0 + + class PasswordEncryptionScheme: # An Interface def encrypt(pw): @@ -40,12 +81,14 @@ _schemes = [] + def registerScheme(id, s): ''' Registers an LDAP password encoding scheme. ''' _schemes.append((id, '{%s}' % id, s)) + def listSchemes(): r = [] for id, prefix, scheme in _schemes: @@ -67,7 +110,7 @@ # All 256 characters are available. salt = '' for n in range(7): -salt += chr(randrange(256)) +salt += chr(_randrange(256)) return salt def encrypt(self, pw): @@ -83,7 +126,7 @@ return 0 salt = ref[20:] compare = b2a_base64(sha(attempt + salt).digest() + salt)[:-1] -return (compare == reference) +return constant_time_compare(compare, reference) registerScheme('SSHA', SSHADigestScheme()) @@ -95,7 +138,7 @@ def validate(self, reference, attempt): compare = b2a_base64(sha(attempt).digest())[:-1] -return (compare == reference) +return constant_time_compare(compare, reference) registerScheme('SHA', SHADigestScheme()) @@ -114,14 +157,14 @@ choices = ("ABCDEFGHIJKLMNOPQRSTUVWXYZ" "abcdefghijklmnopqrstuvwxyz" "0123456789./") -return choice(choices) + choice(choices) +return _choice(choices) + _choice(choices)
[Zope-Checkins] SVN: Zope/tags/2.12.26/ tagged
Log message for revision 128159: tagged Changed: A Zope/tags/2.12.26/ -=- ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/2.12/ vb
Log message for revision 128160: vb Changed: U Zope/branches/2.12/doc/CHANGES.rst U Zope/branches/2.12/setup.py U Zope/branches/2.12/versions.cfg -=- Modified: Zope/branches/2.12/doc/CHANGES.rst === --- Zope/branches/2.12/doc/CHANGES.rst 2012-10-31 14:13:27 UTC (rev 128159) +++ Zope/branches/2.12/doc/CHANGES.rst 2012-10-31 14:14:15 UTC (rev 128160) @@ -5,6 +5,10 @@ Change information for previous versions of Zope can be found at http://docs.zope.org/zope2/releases/. +2.12.27 (unreleased) + + + 2.12.26 (2012-10-31) Modified: Zope/branches/2.12/setup.py === --- Zope/branches/2.12/setup.py 2012-10-31 14:13:27 UTC (rev 128159) +++ Zope/branches/2.12/setup.py 2012-10-31 14:14:15 UTC (rev 128160) @@ -16,7 +16,7 @@ from setuptools import setup, find_packages, Extension setup(name='Zope2', -version='2.12.26', +version='2.12.27dev', url='http://www.zope.org', license='ZPL 2.1', description='Zope2 application server / web framework', Modified: Zope/branches/2.12/versions.cfg === --- Zope/branches/2.12/versions.cfg 2012-10-31 14:13:27 UTC (rev 128159) +++ Zope/branches/2.12/versions.cfg 2012-10-31 14:14:15 UTC (rev 128160) @@ -2,7 +2,7 @@ versions = versions [versions] -Zope2 = 2.12.26 +Zope2 = Acquisition = 2.13.8 buildout.dumppickedversions = 0.4 ClientForm = 0.2.10 ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/2.13/ LP #1071067: Use a stronger random number generator and a constant time comparison function.
Log message for revision 128161: LP #1071067: Use a stronger random number generator and a constant time comparison function. Changed: U Zope/branches/2.13/doc/CHANGES.rst U Zope/branches/2.13/setup.py U Zope/branches/2.13/src/Products/Sessions/BrowserIdManager.py U Zope/branches/2.13/versions.cfg -=- Modified: Zope/branches/2.13/doc/CHANGES.rst === --- Zope/branches/2.13/doc/CHANGES.rst 2012-10-31 14:14:15 UTC (rev 128160) +++ Zope/branches/2.13/doc/CHANGES.rst 2012-10-31 14:14:36 UTC (rev 128161) @@ -5,12 +5,12 @@ Change information for previous versions of Zope can be found at http://docs.zope.org/zope2/releases/. -2.13.19 (unreleased) +2.13.19 (2012-10-31) - Updated distributions: - - AccessControl = 2.13.11 + - AccessControl = 2.13.12 - distribute = 0.6.29 - mr.developer = 1.22 - pytz = 2012g @@ -18,6 +18,9 @@ - repoze.tm2 = 1.0 - tempstorage = 2.12.2 +- LP #1071067: Use a stronger random number generator and a constant time + comparison function. + - LP #1061247: Fix ZMI properties edit form for properties named `method`. - LP #1058049: Fix support for zoperunner section in zope.conf. Modified: Zope/branches/2.13/setup.py === --- Zope/branches/2.13/setup.py 2012-10-31 14:14:15 UTC (rev 128160) +++ Zope/branches/2.13/setup.py 2012-10-31 14:14:36 UTC (rev 128161) @@ -23,7 +23,7 @@ setup(name='Zope2', -version='2.13.19dev', +version='2.13.19', url='http://zope2.zope.org', license='ZPL 2.1', description='Zope2 application server / web framework', Modified: Zope/branches/2.13/src/Products/Sessions/BrowserIdManager.py === --- Zope/branches/2.13/src/Products/Sessions/BrowserIdManager.py 2012-10-31 14:14:15 UTC (rev 128160) +++ Zope/branches/2.13/src/Products/Sessions/BrowserIdManager.py 2012-10-31 14:14:36 UTC (rev 128161) @@ -1,5 +1,5 @@ -# +# # Copyright (c) 2002 Zope Foundation and Contributors. # # This software is subject to the provisions of the Zope Public License, @@ -10,10 +10,12 @@ # FOR A PARTICULAR PURPOSE # + import binascii from cgi import escape +from hashlib import sha256 import logging -import random +import os import re import string import sys @@ -63,6 +65,29 @@ LOG = logging.getLogger('Zope.BrowserIdManager') +# Use the system PRNG if possible +import random +try: +random = random.SystemRandom() +using_sysrandom = True +except NotImplementedError: +using_sysrandom = False + + +def _randint(start, end): +if not using_sysrandom: +# This is ugly, and a hack, but it makes things better than +# the alternative of predictability. This re-seeds the PRNG +# using a value that is hard for an attacker to predict, every +# time a random string is required. This may change the +# properties of the chosen random sequence slightly, but this +# is better than absolute predictability. +random.seed(sha256( +"%s%s%s" % (random.getstate(), time.time(), os.getpid()) +).digest()) +return random.randint(start, end) + + def constructBrowserIdManager( self, id=BROWSERID_MANAGER_NAME, title='', idname='_ZopeId', location=('cookies', 'form'), cookiepath='/', cookiedomain='', @@ -555,7 +580,7 @@ return None -def getNewBrowserId(randint=random.randint, maxint=): +def getNewBrowserId(randint=_randint, maxint=): """ Returns 19-character string browser id '' where: @@ -570,5 +595,4 @@ An example is: 89972317A0C3EHnUi90w """ -return '%08i%s' % (randint(0, maxint-1), getB64TStamp()) - +return '%08i%s' % (randint(0, maxint - 1), getB64TStamp()) Modified: Zope/branches/2.13/versions.cfg === --- Zope/branches/2.13/versions.cfg 2012-10-31 14:14:15 UTC (rev 128160) +++ Zope/branches/2.13/versions.cfg 2012-10-31 14:14:36 UTC (rev 128161) @@ -4,7 +4,7 @@ [versions] # Zope2-specific -Zope2 = +Zope2 = 2.13.19 AccessControl = 2.13.11 Acquisition = 2.13.8 DateTime = 2.12.7 ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/tags/2.13.19/ tagged
Log message for revision 128162: tagged Changed: A Zope/tags/2.13.19/ -=- ___ 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 128163: 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 2012-10-31 14:15:02 UTC (rev 128162) +++ Zope/branches/2.13/doc/CHANGES.rst 2012-10-31 14:15:54 UTC (rev 128163) @@ -5,6 +5,10 @@ Change information for previous versions of Zope can be found at http://docs.zope.org/zope2/releases/. +2.13.20 (unreleased) + + + 2.13.19 (2012-10-31) Modified: Zope/branches/2.13/setup.py === --- Zope/branches/2.13/setup.py 2012-10-31 14:15:02 UTC (rev 128162) +++ Zope/branches/2.13/setup.py 2012-10-31 14:15:54 UTC (rev 128163) @@ -23,7 +23,7 @@ setup(name='Zope2', -version='2.13.19', +version='2.13.20dev', 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 2012-10-31 14:15:02 UTC (rev 128162) +++ Zope/branches/2.13/versions.cfg 2012-10-31 14:15:54 UTC (rev 128163) @@ -4,7 +4,7 @@ [versions] # Zope2-specific -Zope2 = 2.13.19 +Zope2 = AccessControl = 2.13.11 Acquisition = 2.13.8 DateTime = 2.12.7 ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/trunk/ LP #1071067: Use a stronger random number generator and a constant time comparison function.
Log message for revision 128164: LP #1071067: Use a stronger random number generator and a constant time comparison function. Changed: U Zope/trunk/src/Products/Sessions/BrowserIdManager.py U Zope/trunk/versions.cfg -=- Modified: Zope/trunk/src/Products/Sessions/BrowserIdManager.py === --- Zope/trunk/src/Products/Sessions/BrowserIdManager.py2012-10-31 14:15:54 UTC (rev 128163) +++ Zope/trunk/src/Products/Sessions/BrowserIdManager.py2012-10-31 14:16:35 UTC (rev 128164) @@ -1,5 +1,5 @@ -# +# # Copyright (c) 2002 Zope Foundation and Contributors. # # This software is subject to the provisions of the Zope Public License, @@ -10,10 +10,12 @@ # FOR A PARTICULAR PURPOSE # + import binascii from cgi import escape +from hashlib import sha256 import logging -import random +import os import re import string import sys @@ -63,6 +65,29 @@ LOG = logging.getLogger('Zope.BrowserIdManager') +# Use the system PRNG if possible +import random +try: +random = random.SystemRandom() +using_sysrandom = True +except NotImplementedError: +using_sysrandom = False + + +def _randint(start, end): +if not using_sysrandom: +# This is ugly, and a hack, but it makes things better than +# the alternative of predictability. This re-seeds the PRNG +# using a value that is hard for an attacker to predict, every +# time a random string is required. This may change the +# properties of the chosen random sequence slightly, but this +# is better than absolute predictability. +random.seed(sha256( +"%s%s%s" % (random.getstate(), time.time(), os.getpid()) +).digest()) +return random.randint(start, end) + + def constructBrowserIdManager( self, id=BROWSERID_MANAGER_NAME, title='', idname='_ZopeId', location=('cookies', 'form'), cookiepath='/', cookiedomain='', @@ -553,7 +578,7 @@ return None -def getNewBrowserId(randint=random.randint, maxint=): +def getNewBrowserId(randint=_randint, maxint=): """ Returns 19-character string browser id '' where: @@ -568,5 +593,4 @@ An example is: 89972317A0C3EHnUi90w """ -return '%08i%s' % (randint(0, maxint-1), getB64TStamp()) - +return '%08i%s' % (randint(0, maxint - 1), getB64TStamp()) Modified: Zope/trunk/versions.cfg === --- Zope/trunk/versions.cfg 2012-10-31 14:15:54 UTC (rev 128163) +++ Zope/trunk/versions.cfg 2012-10-31 14:16:35 UTC (rev 128164) @@ -5,7 +5,7 @@ [versions] # Zope2-specific Zope2 = -AccessControl = 3.0.5 +AccessControl = 3.0.6 Acquisition = 4.0a1 DateTime = 3.0.2 DocumentTemplate = 2.13.2 ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/2.13/ New ZCTextIndex release
Log message for revision 128492: New ZCTextIndex release 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 2012-12-03 10:12:36 UTC (rev 128491) +++ Zope/branches/2.13/doc/CHANGES.rst 2012-12-03 10:13:39 UTC (rev 128492) @@ -8,7 +8,10 @@ 2.13.20 (unreleased) +- Updated distributions: + - Products.ZCTextIndex = 2.13.4 + 2.13.19 (2012-10-31) Modified: Zope/branches/2.13/versions.cfg === --- Zope/branches/2.13/versions.cfg 2012-12-03 10:12:36 UTC (rev 128491) +++ Zope/branches/2.13/versions.cfg 2012-12-03 10:13:39 UTC (rev 128492) @@ -23,7 +23,7 @@ Products.PythonScripts = 2.13.2 Products.StandardCacheManagers = 2.13.0 Products.ZCatalog = 2.13.23 -Products.ZCTextIndex = 2.13.3 +Products.ZCTextIndex = 2.13.4 Record = 2.13.0 tempstorage = 2.12.2 zExceptions = 2.13.0 ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/trunk/versions.cfg Products.ZCTextIndex = 2.13.4
Log message for revision 128493: Products.ZCTextIndex = 2.13.4 Changed: U Zope/trunk/versions.cfg -=- Modified: Zope/trunk/versions.cfg === --- Zope/trunk/versions.cfg 2012-12-03 10:13:39 UTC (rev 128492) +++ Zope/trunk/versions.cfg 2012-12-03 10:13:52 UTC (rev 128493) @@ -17,7 +17,7 @@ Persistence = 2.13.2 Products.OFSP = 2.13.2 Products.ZCatalog = 3.0a2 -Products.ZCTextIndex = 2.13.3 +Products.ZCTextIndex = 2.13.4 Record = 2.13.0 tempstorage = 2.12.2 zExceptions = 2.13.0 ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/trunk/ DateTime = 3.0.3
Log message for revision 129076: DateTime = 3.0.3 Changed: U Zope/trunk/doc/CHANGES.rst U Zope/trunk/versions.cfg -=- Modified: Zope/trunk/doc/CHANGES.rst === --- Zope/trunk/doc/CHANGES.rst 2013-01-22 10:33:53 UTC (rev 129075) +++ Zope/trunk/doc/CHANGES.rst 2013-01-22 10:34:39 UTC (rev 129076) @@ -77,7 +77,7 @@ - AccessControl = 3.0.5 - Acquisition = 4.0a1 - - DateTime = 3.0.2 + - DateTime = 3.0.3 - ExtensionClass = 4.0a1 - docutils = 0.8.1 - manuel = 1.5.0 Modified: Zope/trunk/versions.cfg === --- Zope/trunk/versions.cfg 2013-01-22 10:33:53 UTC (rev 129075) +++ Zope/trunk/versions.cfg 2013-01-22 10:34:39 UTC (rev 129076) @@ -7,7 +7,7 @@ Zope2 = AccessControl = 3.0.6 Acquisition = 4.0a1 -DateTime = 3.0.2 +DateTime = 3.0.3 DocumentTemplate = 2.13.2 ExtensionClass = 4.0a1 initgroups = 2.13.0 ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/2.13/setup.py Add Python 2 only trove classifier
Log message for revision 129243: Add Python 2 only trove classifier Changed: U Zope/branches/2.13/setup.py -=- Modified: Zope/branches/2.13/setup.py === --- Zope/branches/2.13/setup.py 2013-02-09 22:53:18 UTC (rev 129242) +++ Zope/branches/2.13/setup.py 2013-02-10 14:49:44 UTC (rev 129243) @@ -38,8 +38,10 @@ "License :: OSI Approved :: Zope Public License", "Operating System :: OS Independent", "Programming Language :: Python", +"Programming Language :: Python :: 2 :: Only", "Programming Language :: Python :: 2.6", "Programming Language :: Python :: 2.7", +"Programming Language :: Python :: Implementation :: CPython", ], packages=find_packages('src'), namespace_packages=['Products', 'Shared', 'Shared.DC'], ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/trunk/setup.py Merged c129243 from 2.13 branch
Log message for revision 129244: Merged c129243 from 2.13 branch Changed: U Zope/trunk/setup.py -=- Modified: Zope/trunk/setup.py === --- Zope/trunk/setup.py 2013-02-10 14:49:44 UTC (rev 129243) +++ Zope/trunk/setup.py 2013-02-10 14:51:12 UTC (rev 129244) @@ -38,8 +38,10 @@ "License :: OSI Approved :: Zope Public License", "Operating System :: OS Independent", "Programming Language :: Python", +"Programming Language :: Python :: 2 :: Only", "Programming Language :: Python :: 2.6", "Programming Language :: Python :: 2.7", +"Programming Language :: Python :: Implementation :: CPython", ], packages=find_packages('src'), namespace_packages=['Products', 'Shared', 'Shared.DC'], ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/trunk/src/Products/Five/browser/ Merged c129542 from 2.13 branch
Log message for revision 129698: Merged c129542 from 2.13 branch Changed: U Zope/trunk/src/Products/Five/browser/metaconfigure.py U Zope/trunk/src/Products/Five/browser/tests/pages.txt U Zope/trunk/src/Products/Five/browser/tests/test_menu.py -=- Modified: Zope/trunk/src/Products/Five/browser/metaconfigure.py === --- Zope/trunk/src/Products/Five/browser/metaconfigure.py 2013-02-23 05:28:43 UTC (rev 129697) +++ Zope/trunk/src/Products/Five/browser/metaconfigure.py 2013-02-23 12:56:25 UTC (rev 129698) @@ -208,6 +208,8 @@ (_context, name, (for_, layer), permission, class_, allowed_interface, allowed_attributes) = self.args +name = str(name) # De-unicode + required = {} cdict = {} Modified: Zope/trunk/src/Products/Five/browser/tests/pages.txt === --- Zope/trunk/src/Products/Five/browser/tests/pages.txt2013-02-23 05:28:43 UTC (rev 129697) +++ Zope/trunk/src/Products/Five/browser/tests/pages.txt2013-02-23 12:56:25 UTC (rev 129698) @@ -87,15 +87,15 @@ Both browser:view and browser:page are ILocation providers, so make sure they -have a __name__ attribute: +have a __name__ attribute with a str instance: >>> page = self.folder.unrestrictedTraverse('testoid/eagle.txt') >>> page.__name__ - u'eagle.txt' + 'eagle.txt' >>> view = self.folder.unrestrictedTraverse('testoid/named_view') >>> view.__name__ - u'named_view' + 'named_view' ZPT-based browser pages --- Modified: Zope/trunk/src/Products/Five/browser/tests/test_menu.py === --- Zope/trunk/src/Products/Five/browser/tests/test_menu.py 2013-02-23 05:28:43 UTC (rev 129697) +++ Zope/trunk/src/Products/Five/browser/tests/test_menu.py 2013-02-23 12:56:25 UTC (rev 129698) @@ -49,7 +49,7 @@ >>> menu.sort(lambda x, y: cmp(x['title'], y['title'])) >>> from pprint import pprint >>> pprint(menu[0]) - {'action': u'@@cockatiel_menu_public.html', + {'action': '@@cockatiel_menu_public.html', 'description': u'', 'extra': None, 'icon': None, @@ -100,7 +100,7 @@ >>> menu.sort(lambda x, y: cmp(x['title'], y['title'])) >>> pprint(menu[0]) - {'action': u'@@cockatiel_menu_protected.html', + {'action': '@@cockatiel_menu_protected.html', 'description': u'', 'extra': None, 'icon': None, @@ -109,7 +109,7 @@ 'title': u'Page in a menu (protected)'} >>> pprint(menu[1]) - {'action': u'@@cockatiel_menu_public.html', + {'action': '@@cockatiel_menu_public.html', 'description': u'', 'extra': None, 'icon': None, ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/trunk/ update to some new releases
Log message for revision 129736: update to some new releases Changed: U Zope/trunk/doc/CHANGES.rst U Zope/trunk/versions.cfg -=- Modified: Zope/trunk/doc/CHANGES.rst === --- Zope/trunk/doc/CHANGES.rst 2013-02-24 13:42:41 UTC (rev 129735) +++ Zope/trunk/doc/CHANGES.rst 2013-02-24 13:46:16 UTC (rev 129736) @@ -85,12 +85,12 @@ - Updated distributions: - AccessControl = 3.0.5 - - Acquisition = 4.0a1 - - DateTime = 3.0.3 - - ExtensionClass = 4.0a1 + - Acquisition = 4.0 + - DateTime = 4.0 + - ExtensionClass = 4.0 - docutils = 0.8.1 - manuel = 1.5.0 - - Products.ZCatalog = 3.0a2 + - Products.ZCatalog = 3.0b1 Restructuring + Modified: Zope/trunk/versions.cfg === --- Zope/trunk/versions.cfg 2013-02-24 13:42:41 UTC (rev 129735) +++ Zope/trunk/versions.cfg 2013-02-24 13:46:16 UTC (rev 129736) @@ -6,17 +6,17 @@ # Zope2-specific Zope2 = AccessControl = 3.0.6 -Acquisition = 4.0a1 -DateTime = 3.0.3 +Acquisition = 4.0 +DateTime = 4.0 DocumentTemplate = 2.13.2 -ExtensionClass = 4.0a1 +ExtensionClass = 4.0 initgroups = 2.13.0 Missing = 2.13.1 MultiMapping = 2.13.0 nt-svcutils = 2.13.0 Persistence = 2.13.2 Products.OFSP = 2.13.2 -Products.ZCatalog = 3.0a2 +Products.ZCatalog = 3.0b1 Products.ZCTextIndex = 2.13.4 Record = 2.13.0 tempstorage = 2.12.2 ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/trunk/ get a non-beta zcatalog release
Log message for revision 129743: get a non-beta zcatalog release Changed: U Zope/trunk/doc/CHANGES.rst U Zope/trunk/versions.cfg -=- Modified: Zope/trunk/doc/CHANGES.rst === --- Zope/trunk/doc/CHANGES.rst 2013-02-24 14:07:54 UTC (rev 129742) +++ Zope/trunk/doc/CHANGES.rst 2013-02-24 14:08:36 UTC (rev 129743) @@ -90,7 +90,7 @@ - ExtensionClass = 4.0 - docutils = 0.8.1 - manuel = 1.5.0 - - Products.ZCatalog = 3.0b1 + - Products.ZCatalog = 3.0 Restructuring + Modified: Zope/trunk/versions.cfg === --- Zope/trunk/versions.cfg 2013-02-24 14:07:54 UTC (rev 129742) +++ Zope/trunk/versions.cfg 2013-02-24 14:08:36 UTC (rev 129743) @@ -16,7 +16,7 @@ nt-svcutils = 2.13.0 Persistence = 2.13.2 Products.OFSP = 2.13.2 -Products.ZCatalog = 3.0b1 +Products.ZCatalog = 3.0 Products.ZCTextIndex = 2.13.4 Record = 2.13.0 tempstorage = 2.12.2 ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/trunk/sources.cfg update sources to point to github for moved packages
Log message for revision 129836: update sources to point to github for moved packages Changed: U Zope/trunk/sources.cfg -=- Modified: Zope/trunk/sources.cfg === --- Zope/trunk/sources.cfg 2013-02-26 12:22:53 UTC (rev 129835) +++ Zope/trunk/sources.cfg 2013-02-26 12:25:21 UTC (rev 129836) @@ -1,20 +1,21 @@ [buildout] extends = http://svn.zope.org/repos/main/zopetoolkit/trunk/ztk-sources.cfg svn-zope-org = ^ +github = git://github.com/zopefoundation [sources] # Zope2-specific -AccessControl = svn ${buildout:svn-zope-org}/AccessControl/trunk -Acquisition = svn ${buildout:svn-zope-org}/Acquisition/trunk -DateTime = svn ${buildout:svn-zope-org}/DateTime/trunk -DocumentTemplate = svn ${buildout:svn-zope-org}/DocumentTemplate/trunk -ExtensionClass = svn ${buildout:svn-zope-org}/ExtensionClass/trunk -initgroups = svn ${buildout:svn-zope-org}/initgroups/trunk -Missing = svn ${buildout:svn-zope-org}/Missing/trunk -MultiMapping = svn ${buildout:svn-zope-org}/MultiMapping/trunk -nt_svcutils = svn ${buildout:svn-zope-org}/nt_svcutils/trunk -Persistence = svn ${buildout:svn-zope-org}/Persistence/trunk -Products.OFSP = svn ${buildout:svn-zope-org}/Products.OFSP/trunk +AccessControl = git ${buildout:github}/AccessControl +Acquisition = git ${buildout:github}/Acquisition +DateTime = git ${buildout:github}/DateTime +DocumentTemplate = git ${buildout:github}/DocumentTemplate +ExtensionClass = git ${buildout:github}/ExtensionClass +initgroups = git ${buildout:github}/initgroups +Missing = git ${buildout:github}/Missing +MultiMapping = git ${buildout:github}/MultiMapping +nt_svcutils = git ${buildout:github}/nt_svcutils +Persistence = git ${buildout:github}/Persistence +Products.OFSP = git ${buildout:github}/Products.OFSP Products.ZCatalog = svn ${buildout:svn-zope-org}/Products.ZCatalog/trunk Products.ZCTextIndex = svn ${buildout:svn-zope-org}/Products.ZCTextIndex/trunk Record = svn ${buildout:svn-zope-org}/Record/trunk @@ -24,8 +25,8 @@ ZopeUndo = svn ${buildout:svn-zope-org}/ZopeUndo/trunk # Deprecated / CMF dependencies -Products.BTreeFolder2 = svn ${buildout:svn-zope-org}/Products.BTreeFolder2/trunk -Products.ExternalMethod = svn ${buildout:svn-zope-org}/Products.ExternalMethod/trunk +Products.BTreeFolder2 = git ${buildout:github}/Products.BTreeFolder2 +Products.ExternalMethod = git ${buildout:github}/Products.ExternalMethod Products.MailHost = svn ${buildout:svn-zope-org}/Products.MailHost/trunk -Products.PythonScripts = svn ${buildout:svn-zope-org}/Products.PythonScripts/trunk -Products.StandardCacheManagers = svn ${buildout:svn-zope-org}/Products.StandardCacheManagers/trunk +Products.PythonScripts = git ${buildout:github}/Products.PythonScripts +Products.StandardCacheManagers = git ${buildout:github}/Products.StandardCacheManagers ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/2.13/sources.cfg update sources to point to github
Log message for revision 129838: update sources to point to github Changed: U Zope/branches/2.13/sources.cfg -=- Modified: Zope/branches/2.13/sources.cfg === --- Zope/branches/2.13/sources.cfg 2013-02-26 12:30:32 UTC (rev 129837) +++ Zope/branches/2.13/sources.cfg 2013-02-26 12:31:10 UTC (rev 129838) @@ -1,25 +1,27 @@ +[buildout] +svn-zope-org = ^ +github = git://github.com/zopefoundation + [sources] -AccessControl = svn ^/AccessControl/branches/2.13 -Acquisition = svn ^/Acquisition/trunk -DateTime = svn ^/DateTime/branches/2.12 -DocumentTemplate = svn ^/DocumentTemplate/trunk -ExtensionClass = svn ^/ExtensionClass/trunk -initgroups = svn ^/initgroups/trunk -Missing = svn ^/Missing/trunk -MultiMapping = svn ^/MultiMapping/trunk -nt_svcutils = svn ^/nt_svcutils/trunk -Persistence = svn ^/Persistence/trunk -Products.BTreeFolder2 = svn ^/Products.BTreeFolder2/trunk -Products.ExternalMethod = svn ^/Products.ExternalMethod/trunk -Products.MIMETools = svn ^/Products.MIMETools/trunk -Products.OFSP = svn ^/Products.OFSP/trunk -Products.PythonScripts = svn ^/Products.PythonScripts/trunk -Products.StandardCacheManagers = svn ^/Products.StandardCacheManagers/trunk +AccessControl = git ${buildout:github}/AccessControl branch=2.13 +Acquisition = git ${buildout:github}/Acquisition +DateTime = git ${buildout:github}/DateTime branch=2.12 +DocumentTemplate = git ${buildout:github}/DocumentTemplate +ExtensionClass = git ${buildout:github}/ExtensionClass +initgroups = git ${buildout:github}/initgroups +Missing = git ${buildout:github}/Missing +MultiMapping = git ${buildout:github}/MultiMapping +nt_svcutils = git ${buildout:github}/nt_svcutils +Persistence = git ${buildout:github}/Persistence +Products.BTreeFolder2 = git ${buildout:github}/Products.BTreeFolder2 +Products.ExternalMethod = git ${buildout:github}/Products.ExternalMethod +Products.MIMETools = git ${buildout:github}/Products.MIMETools +Products.OFSP = git ${buildout:github}/Products.OFSP +Products.PythonScripts = git ${buildout:github}/Products.PythonScripts +Products.StandardCacheManagers = git ${buildout:github}/Products.StandardCacheManagers Products.ZCatalog = svn ^/Products.ZCatalog/branches/2.13 Products.ZCTextIndex = svn ^/Products.ZCTextIndex/trunk Record = svn ^/Record/trunk tempstorage = svn ^/tempstorage/trunk zExceptions = svn ^/zExceptions/trunk -ZODB3 = svn ^/ZODB/trunk ZopeUndo = svn ^/ZopeUndo/trunk -ZConfig = svn ^/ZConfig/trunk ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins