[Zope-Checkins] SVN: Products.Five/trunk/ Comply with repository policy.
Log message for revision 113601: Comply with repository policy. Changed: A Products.Five/trunk/COPYRIGHT.txt A Products.Five/trunk/LICENSE.txt -=- Added: Products.Five/trunk/COPYRIGHT.txt === --- Products.Five/trunk/COPYRIGHT.txt (rev 0) +++ Products.Five/trunk/COPYRIGHT.txt 2010-06-18 06:27:54 UTC (rev 113601) @@ -0,0 +1 @@ +Zope Foundation and Contributors \ No newline at end of file Property changes on: Products.Five/trunk/COPYRIGHT.txt ___ Added: svn:eol-style + native Added: Products.Five/trunk/LICENSE.txt === --- Products.Five/trunk/LICENSE.txt (rev 0) +++ Products.Five/trunk/LICENSE.txt 2010-06-18 06:27:54 UTC (rev 113601) @@ -0,0 +1,44 @@ +Zope Public License (ZPL) Version 2.1 + +A copyright notice accompanies this license document that identifies the +copyright holders. + +This license has been certified as open source. It has also been designated as +GPL compatible by the Free Software Foundation (FSF). + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions in source code must retain the accompanying copyright +notice, this list of conditions, and the following disclaimer. + +2. Redistributions in binary form must reproduce the accompanying copyright +notice, this list of conditions, and the following disclaimer in the +documentation and/or other materials provided with the distribution. + +3. Names of the copyright holders must not be used to endorse or promote +products derived from this software without prior written permission from the +copyright holders. + +4. The right to distribute this software or to use it for any purpose does not +give you the right to use Servicemarks (sm) or Trademarks (tm) of the +copyright +holders. Use of them is covered by separate agreement with the copyright +holders. + +5. If any files are modified, you must cause the modified files to carry +prominent notices stating that you changed the files and the date of any +change. + +Disclaimer + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY EXPRESSED +OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Property changes on: Products.Five/trunk/LICENSE.txt ___ Added: svn:eol-style + native ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/trunk/src/OFS/interfaces.py - IContainmentRoot is now IRoot
Log message for revision 113612: - IContainmentRoot is now IRoot Changed: U Zope/trunk/src/OFS/interfaces.py -=- Modified: Zope/trunk/src/OFS/interfaces.py === --- Zope/trunk/src/OFS/interfaces.py2010-06-18 09:24:59 UTC (rev 113611) +++ Zope/trunk/src/OFS/interfaces.py2010-06-18 09:26:01 UTC (rev 113612) @@ -10,13 +10,15 @@ # FOR A PARTICULAR PURPOSE. # ## -OFS z3 interfaces. +OFS interfaces. $Id$ from zope.container.interfaces import IContainer from zope.interface import Attribute from zope.interface import Interface +from zope.location.interfaces import IPossibleSite +from zope.location.interfaces import IRoot from zope.schema import Bool, BytesLine, Tuple from AccessControl.interfaces import IOwned @@ -28,8 +30,6 @@ from webdav.interfaces import IDAVCollection from webdav.interfaces import IDAVResource -from zope.traversing.interfaces import IContainmentRoot -from zope.location.interfaces import IPossibleSite class IOrderedContainer(Interface): @@ -834,7 +834,7 @@ # XXX: might contain non-API methods and outdated comments; # not synced with ZopeBook API Reference; # based on OFS.Application.Application -class IApplication(IFolder, IContainmentRoot): +class IApplication(IFolder, IRoot): Top-level system object ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/rochael-TM_sortKey/doc/CHANGES.rst record setSortKey() changes
Log message for revision 113621: record setSortKey() changes Changed: U Zope/branches/rochael-TM_sortKey/doc/CHANGES.rst -=- Modified: Zope/branches/rochael-TM_sortKey/doc/CHANGES.rst === --- Zope/branches/rochael-TM_sortKey/doc/CHANGES.rst2010-06-18 18:27:43 UTC (rev 113620) +++ Zope/branches/rochael-TM_sortKey/doc/CHANGES.rst2010-06-18 19:04:36 UTC (rev 113621) @@ -38,6 +38,10 @@ - Missing = 2.13.1 - Persistence = 2.13.2 +- Added setSortKey() method to the Shared.DC.ZRDB.TM.TM class + to allow database connections to specify the commit order without + needing to override the sortKey() method. + 2.12.7 (2010-06-13) --- ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/2.12/ merge branch rochael-TM_sortKey: add a setSortKey method to Shared.setSortKey() method to Shared.DC.ZRDB.TM.TM
Log message for revision 113622: merge branch rochael-TM_sortKey: add a setSortKey method to Shared.setSortKey() method to Shared.DC.ZRDB.TM.TM Changed: U Zope/branches/2.12/doc/CHANGES.rst U Zope/branches/2.12/src/Shared/DC/ZRDB/TM.py A Zope/branches/2.12/src/Shared/DC/ZRDB/tests/testTM.py -=- Modified: Zope/branches/2.12/doc/CHANGES.rst === --- Zope/branches/2.12/doc/CHANGES.rst 2010-06-18 19:04:36 UTC (rev 113621) +++ Zope/branches/2.12/doc/CHANGES.rst 2010-06-18 19:18:30 UTC (rev 113622) @@ -38,6 +38,10 @@ - Missing = 2.13.1 - Persistence = 2.13.2 +- Added setSortKey() method to the Shared.DC.ZRDB.TM.TM class + to allow database connections to specify the commit order without + needing to override the sortKey() method. + 2.12.7 (2010-06-13) --- Modified: Zope/branches/2.12/src/Shared/DC/ZRDB/TM.py === --- Zope/branches/2.12/src/Shared/DC/ZRDB/TM.py 2010-06-18 19:04:36 UTC (rev 113621) +++ Zope/branches/2.12/src/Shared/DC/ZRDB/TM.py 2010-06-18 19:18:30 UTC (rev 113622) @@ -26,7 +26,7 @@ needed at the start of a transaction. A subclass that uses locking during transaction commit must -defined a sortKey() method. +define a sortKey() method. _registered=None @@ -66,14 +66,19 @@ tpc_abort = abort +# Most DA's talking to RDBMS systems do not care about commit order, so +# return the constant 1 +_sort_key = 1 + def sortKey(self, *ignored): - The sortKey method is used for recent ZODB compatibility which -needs to have a known commit order for lock acquisition. Most -DA's talking to RDBMS systems do not care about commit order, so -return the constant 1 + The sortKey method is used by ZODB to have a known commit order for +lock acquisition. -return 1 +return self._sort_key +def setSortKey(self, sort_key): +self._sort_key = sort_key + class Surrogate: def __init__(self, db): Copied: Zope/branches/2.12/src/Shared/DC/ZRDB/tests/testTM.py (from rev 113621, Zope/branches/rochael-TM_sortKey/src/Shared/DC/ZRDB/tests/testTM.py) === --- Zope/branches/2.12/src/Shared/DC/ZRDB/tests/testTM.py (rev 0) +++ Zope/branches/2.12/src/Shared/DC/ZRDB/tests/testTM.py 2010-06-18 19:18:30 UTC (rev 113622) @@ -0,0 +1,29 @@ +## +# +# Copyright (c) 2009 Zope Foundation and Contributors. +# +# This software is subject to the provisions of the Zope Public License, +# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution. +# THIS SOFTWARE IS PROVIDED AS IS AND ANY AND ALL EXPRESS OR IMPLIED +# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS +# FOR A PARTICULAR PURPOSE +# +## + +from unittest import TestCase, TestSuite, makeSuite +from Shared.DC.ZRDB.TM import TM + +class TestTM(TestCase): + +def test_sortKey(self): +tm = TM() +# the default Transaction Manager should have .sortKey() of 1 for +# backward compatibility +self.assertEquals(tm.sortKey(), 1) +# but the sortKey() should be adjustable +tm.setSortKey(()) +self.assertEquals(tm.sortKey(), ()) + +def test_suite(): +return TestSuite((makeSuite(TestTM),)) ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/trunk/ merge branch rochael-TM_sortKey: add a setSortKey method to Shared.setSortKey() method to Shared.DC.ZRDB.TM.TM
Log message for revision 113623: merge branch rochael-TM_sortKey: add a setSortKey method to Shared.setSortKey() method to Shared.DC.ZRDB.TM.TM Changed: U Zope/trunk/doc/CHANGES.rst U Zope/trunk/src/Shared/DC/ZRDB/TM.py A Zope/trunk/src/Shared/DC/ZRDB/tests/testTM.py -=- Modified: Zope/trunk/doc/CHANGES.rst === --- Zope/trunk/doc/CHANGES.rst 2010-06-18 19:18:30 UTC (rev 113622) +++ Zope/trunk/doc/CHANGES.rst 2010-06-18 19:33:34 UTC (rev 113623) @@ -145,6 +145,10 @@ - ZCTextIndex query parser treats fullwidth space characters defined in Unicode as valid white space. +- Added ``setSortKey()`` method to the ``Shared.DC.ZRDB.TM.TM`` class + to allow database connections to specify the commit order without + needing to override the ``sortKey()`` method. + - Updated packages: - Jinja2 = 2.5.0 Modified: Zope/trunk/src/Shared/DC/ZRDB/TM.py === --- Zope/trunk/src/Shared/DC/ZRDB/TM.py 2010-06-18 19:18:30 UTC (rev 113622) +++ Zope/trunk/src/Shared/DC/ZRDB/TM.py 2010-06-18 19:33:34 UTC (rev 113623) @@ -26,7 +26,7 @@ needed at the start of a transaction. A subclass that uses locking during transaction commit must -defined a sortKey() method. +define a sortKey() method. _registered=None @@ -66,14 +66,19 @@ tpc_abort = abort +# Most DA's talking to RDBMS systems do not care about commit order, so +# return the constant 1 +_sort_key = 1 + def sortKey(self, *ignored): - The sortKey method is used for recent ZODB compatibility which -needs to have a known commit order for lock acquisition. Most -DA's talking to RDBMS systems do not care about commit order, so -return the constant 1 + The sortKey method is used by the transaction subsystem to have a +known commit order for lock acquisition. -return 1 +return self._sort_key +def setSortKey(self, sort_key): +self._sort_key = sort_key + class Surrogate: def __init__(self, db): Copied: Zope/trunk/src/Shared/DC/ZRDB/tests/testTM.py (from rev 113621, Zope/branches/rochael-TM_sortKey/src/Shared/DC/ZRDB/tests/testTM.py) === --- Zope/trunk/src/Shared/DC/ZRDB/tests/testTM.py (rev 0) +++ Zope/trunk/src/Shared/DC/ZRDB/tests/testTM.py 2010-06-18 19:33:34 UTC (rev 113623) @@ -0,0 +1,30 @@ +## +# +# Copyright (c) 2010 Zope Foundation and Contributors. +# +# This software is subject to the provisions of the Zope Public License, +# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution. +# THIS SOFTWARE IS PROVIDED AS IS AND ANY AND ALL EXPRESS OR IMPLIED +# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS +# FOR A PARTICULAR PURPOSE +# +## + +from unittest import TestCase, TestSuite, makeSuite +from Shared.DC.ZRDB.TM import TM + +class TestTM(TestCase): + +def test_sortKey(self): +tm = TM() +# the default Transaction Manager should have .sortKey() of 1 for +# backward compatibility +self.assertEquals(tm.sortKey(), 1) +# but the sortKey() should be adjustable +tm.setSortKey(()) +self.assertEquals(tm.sortKey(), ()) + +def test_suite(): +return TestSuite((makeSuite(TestTM),)) + ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/2.12/ ReST changes, and it's a new year already
Log message for revision 113624: ReST changes, and it's a new year already Changed: U Zope/branches/2.12/doc/CHANGES.rst U Zope/branches/2.12/src/Shared/DC/ZRDB/tests/testTM.py -=- Modified: Zope/branches/2.12/doc/CHANGES.rst === --- Zope/branches/2.12/doc/CHANGES.rst 2010-06-18 19:33:34 UTC (rev 113623) +++ Zope/branches/2.12/doc/CHANGES.rst 2010-06-18 19:38:08 UTC (rev 113624) @@ -38,9 +38,9 @@ - Missing = 2.13.1 - Persistence = 2.13.2 -- Added setSortKey() method to the Shared.DC.ZRDB.TM.TM class +- Added ``setSortKey()`` method to the ``Shared.DC.ZRDB.TM.TM`` class to allow database connections to specify the commit order without - needing to override the sortKey() method. + needing to override the ``sortKey()`` method. 2.12.7 (2010-06-13) --- Modified: Zope/branches/2.12/src/Shared/DC/ZRDB/tests/testTM.py === --- Zope/branches/2.12/src/Shared/DC/ZRDB/tests/testTM.py 2010-06-18 19:33:34 UTC (rev 113623) +++ Zope/branches/2.12/src/Shared/DC/ZRDB/tests/testTM.py 2010-06-18 19:38:08 UTC (rev 113624) @@ -1,6 +1,6 @@ ## # -# Copyright (c) 2009 Zope Foundation and Contributors. +# Copyright (c) 2010 Zope Foundation and Contributors. # # This software is subject to the provisions of the Zope Public License, # Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution. ___ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins