[Checkins] SVN: zope.transaction/trunk/ Rename setup.py-generated
package to from 'zope.transaction' to 'transaction' for
backwards compatibility.
Chris McDonough
chrism at plope.com
Fri Nov 9 11:27:33 EST 2007
Log message for revision 81644:
Rename setup.py-generated package to from 'zope.transaction' to 'transaction' for backwards compatibility.
Remove unit tests that depend on ZODB (they are integration tests).
Changed:
U zope.transaction/trunk/CHANGES.txt
U zope.transaction/trunk/setup.py
U zope.transaction/trunk/transaction/__init__.py
U zope.transaction/trunk/transaction/_manager.py
U zope.transaction/trunk/transaction/_transaction.py
U zope.transaction/trunk/transaction/tests/doom.txt
U zope.transaction/trunk/transaction/tests/savepoint.txt
U zope.transaction/trunk/transaction/tests/savepointsample.py
U zope.transaction/trunk/transaction/tests/test_register_compat.py
U zope.transaction/trunk/transaction/tests/test_savepoint.py
U zope.transaction/trunk/transaction/tests/test_transaction.py
U zope.transaction/trunk/transaction/tests/test_weakset.py
D zope.transaction/trunk/zope/
-=-
Modified: zope.transaction/trunk/CHANGES.txt
===================================================================
--- zope.transaction/trunk/CHANGES.txt 2007-11-09 16:27:01 UTC (rev 81643)
+++ zope.transaction/trunk/CHANGES.txt 2007-11-09 16:27:32 UTC (rev 81644)
@@ -7,3 +7,6 @@
addBeforeCommitHook.
Add weakset tests.
+
+ Remove unit tests that depend on ZODB.tests.utils from
+ test_transaction (these are actually integration tests).
Modified: zope.transaction/trunk/setup.py
===================================================================
--- zope.transaction/trunk/setup.py 2007-11-09 16:27:01 UTC (rev 81643)
+++ zope.transaction/trunk/setup.py 2007-11-09 16:27:32 UTC (rev 81644)
@@ -24,7 +24,7 @@
here = os.path.abspath(os.path.dirname(__file__))
README = open(os.path.join(here, 'README.txt')).read()
-setup(name='zope.transaction',
+setup(name='transaction',
version=__version__,
description='Transaction management for Python',
long_description=README,
@@ -45,10 +45,11 @@
packages=find_packages(),
include_package_data=True,
zip_safe=False,
- test_suite="zope.transaction.tests",
- tests_require = ['zope.interface',
- 'zope.testing',
- 'ZODB3'],
+ test_suite="transaction.tests",
+ tests_require = [
+ 'zope.interface',
+ 'zope.testing',
+ ],
install_requires=[
'zope.interface',
],
Modified: zope.transaction/trunk/transaction/__init__.py
===================================================================
--- zope.transaction/trunk/transaction/__init__.py 2007-11-09 16:27:01 UTC (rev 81643)
+++ zope.transaction/trunk/transaction/__init__.py 2007-11-09 16:27:32 UTC (rev 81644)
@@ -16,9 +16,9 @@
$Id$
"""
-from zope.transaction._transaction import Transaction
-from zope.transaction._manager import TransactionManager
-from zope.transaction._manager import ThreadTransactionManager
+from transaction._transaction import Transaction
+from transaction._manager import TransactionManager
+from transaction._manager import ThreadTransactionManager
manager = ThreadTransactionManager()
get = manager.get
Modified: zope.transaction/trunk/transaction/_manager.py
===================================================================
--- zope.transaction/trunk/transaction/_manager.py 2007-11-09 16:27:01 UTC (rev 81643)
+++ zope.transaction/trunk/transaction/_manager.py 2007-11-09 16:27:32 UTC (rev 81644)
@@ -19,9 +19,9 @@
import thread
-from zope.transaction.weakset import WeakSet
+from transaction.weakset import WeakSet
-from zope.transaction._transaction import Transaction
+from transaction._transaction import Transaction
# Used for deprecated arguments. ZODB.utils.DEPRECATED_ARGUMENT was
# too hard to use here, due to the convoluted import dance across
Modified: zope.transaction/trunk/transaction/_transaction.py
===================================================================
--- zope.transaction/trunk/transaction/_transaction.py 2007-11-09 16:27:01 UTC (rev 81643)
+++ zope.transaction/trunk/transaction/_transaction.py 2007-11-09 16:27:32 UTC (rev 81644)
@@ -107,9 +107,9 @@
from zope import interface
-from zope.transaction.weakset import WeakSet
-from zope.transaction.interfaces import TransactionFailedError
-from zope.transaction import interfaces
+from transaction.weakset import WeakSet
+from transaction.interfaces import TransactionFailedError
+from transaction import interfaces
_marker = object()
Modified: zope.transaction/trunk/transaction/tests/doom.txt
===================================================================
--- zope.transaction/trunk/transaction/tests/doom.txt 2007-11-09 16:27:01 UTC (rev 81643)
+++ zope.transaction/trunk/transaction/tests/doom.txt 2007-11-09 16:27:32 UTC (rev 81644)
@@ -25,7 +25,7 @@
To see how it works we first need to create a stub data manager:
- >>> from zope.transaction.interfaces import IDataManager
+ >>> from transaction.interfaces import IDataManager
>>> from zope.interface import implements
>>> class DataManager:
... implements(IDataManager)
@@ -45,7 +45,7 @@
Start a new transaction:
- >>> from zope import transaction
+ >>> import transaction
>>> txn = transaction.begin()
>>> dm = DataManager()
>>> txn.join(dm)
Modified: zope.transaction/trunk/transaction/tests/savepoint.txt
===================================================================
--- zope.transaction/trunk/transaction/tests/savepoint.txt 2007-11-09 16:27:01 UTC (rev 81643)
+++ zope.transaction/trunk/transaction/tests/savepoint.txt 2007-11-09 16:27:32 UTC (rev 81644)
@@ -24,8 +24,8 @@
transaction system. This data manager is very simple. It provides flat
storage of named immutable values, like strings and numbers.
- >>> from zope import transaction
- >>> from zope.transaction.tests import savepointsample
+ >>> import transaction
+ >>> from transaction.tests import savepointsample
>>> dm = savepointsample.SampleSavepointDataManager()
>>> dm['name'] = 'bob'
Modified: zope.transaction/trunk/transaction/tests/savepointsample.py
===================================================================
--- zope.transaction/trunk/transaction/tests/savepointsample.py 2007-11-09 16:27:01 UTC (rev 81643)
+++ zope.transaction/trunk/transaction/tests/savepointsample.py 2007-11-09 16:27:32 UTC (rev 81644)
@@ -23,7 +23,7 @@
import UserDict
from zope import interface
-import zope.transaction.interfaces
+import transaction.interfaces
class SampleDataManager(UserDict.DictMixin):
"""Sample implementation of data manager that doesn't support savepoints
@@ -31,12 +31,12 @@
This data manager stores named simple values, like strings and numbers.
"""
- interface.implements(zope.transaction.interfaces.IDataManager)
+ interface.implements(transaction.interfaces.IDataManager)
def __init__(self, transaction_manager=None):
if transaction_manager is None:
# Use the thread-local transaction manager if none is provided:
- from zope import transaction
+ import transaction
transaction_manager = transaction.manager
self.transaction_manager = transaction_manager
@@ -158,7 +158,7 @@
This extends the basic data manager with savepoint support.
"""
- interface.implements(zope.transaction.interfaces.ISavepointDataManager)
+ interface.implements(transaction.interfaces.ISavepointDataManager)
def savepoint(self):
# When we create the savepoint, we save the existing database state.
@@ -175,7 +175,7 @@
class SampleSavepoint:
- interface.implements(zope.transaction.interfaces.IDataManagerSavepoint)
+ interface.implements(transaction.interfaces.IDataManagerSavepoint)
def __init__(self, data_manager, data):
self.data_manager = data_manager
Modified: zope.transaction/trunk/transaction/tests/test_register_compat.py
===================================================================
--- zope.transaction/trunk/transaction/tests/test_register_compat.py 2007-11-09 16:27:01 UTC (rev 81643)
+++ zope.transaction/trunk/transaction/tests/test_register_compat.py 2007-11-09 16:27:32 UTC (rev 81644)
@@ -91,7 +91,7 @@
>>> transaction.abort()
"""
-from zope import transaction
+import transaction
class Object(object):
Modified: zope.transaction/trunk/transaction/tests/test_savepoint.py
===================================================================
--- zope.transaction/trunk/transaction/tests/test_savepoint.py 2007-11-09 16:27:01 UTC (rev 81643)
+++ zope.transaction/trunk/transaction/tests/test_savepoint.py 2007-11-09 16:27:32 UTC (rev 81644)
@@ -26,8 +26,8 @@
rollback savepoints for data managers that joined savepoints after the
savepoint:
- >>> from zope import transaction
- >>> from zope.transaction.tests import savepointsample
+ >>> import transaction
+ >>> from transaction.tests import savepointsample
>>> dm = savepointsample.SampleSavepointDataManager()
>>> dm['name'] = 'bob'
>>> sp1 = transaction.savepoint()
Modified: zope.transaction/trunk/transaction/tests/test_transaction.py
===================================================================
--- zope.transaction/trunk/transaction/tests/test_transaction.py 2007-11-09 16:27:01 UTC (rev 81643)
+++ zope.transaction/trunk/transaction/tests/test_transaction.py 2007-11-09 16:27:32 UTC (rev 81644)
@@ -43,8 +43,8 @@
import unittest
import warnings
-from zope import transaction
-from zope.transaction.tests.warnhook import WarningsHook
+import transaction
+from transaction.tests.warnhook import WarningsHook
_ADDRESS_MASK = 256 ** struct.calcsize('P')
def positive_id(obj):
@@ -353,8 +353,8 @@
The argument to join must be a zodb4 data manager,
transaction.interfaces.IDataManager.
- >>> from zope.transaction.tests.sampledm import DataManager
- >>> from zope.transaction._transaction import DataManagerAdapter
+ >>> from transaction.tests.sampledm import DataManager
+ >>> from transaction._transaction import DataManagerAdapter
>>> t = transaction.Transaction()
>>> dm = DataManager()
>>> t.join(dm)
@@ -386,7 +386,7 @@
Now register the hook with a transaction.
- >>> from zope import transaction
+ >>> import transaction
>>> t = transaction.begin()
>>> t.addBeforeCommitHook(hook, '1')
@@ -507,43 +507,6 @@
'rec0']
>>> reset_log()
- When modifing persitent objects within before commit hooks
- modifies the objects, of course :)
-
- Start a new transaction
-
- >>> t = transaction.begin()
-
- Create a DB instance and add a IOBTree within
-
- >>> from ZODB.tests.util import DB
- >>> from ZODB.tests.util import P
- >>> db = DB()
- >>> con = db.open()
- >>> root = con.root()
- >>> root['p'] = P('julien')
- >>> p = root['p']
-
- >>> p.name
- 'julien'
-
- This hook will get the object from the `DB` instance and change
- the flag attribute.
-
- >>> def hookmodify(status, arg=None, kw1='no_kw1', kw2='no_kw2'):
- ... p.name = 'jul'
-
- Now register this hook and commit.
-
- >>> t.addBeforeCommitHook(hookmodify, (p, 1))
- >>> transaction.commit()
-
- Nothing should have changed since it should have been aborted.
-
- >>> p.name
- 'jul'
-
- >>> db.close()
"""
def test_addAfterCommitHook():
@@ -560,7 +523,7 @@
Now register the hook with a transaction.
- >>> from zope import transaction
+ >>> import transaction
>>> t = transaction.begin()
>>> t.addAfterCommitHook(hook, '1')
@@ -723,47 +686,6 @@
0
>>> reset_log()
-
-
- The transaction is already committed when the after commit hooks
- will be executed. Executing the hooks must not have further
- effects on persistent objects.
-
- Start a new transaction
-
- >>> t = transaction.begin()
-
- Create a DB instance and add a IOBTree within
-
- >>> from ZODB.tests.util import DB
- >>> from ZODB.tests.util import P
- >>> db = DB()
- >>> con = db.open()
- >>> root = con.root()
- >>> root['p'] = P('julien')
- >>> p = root['p']
-
- >>> p.name
- 'julien'
-
- This hook will get the object from the `DB` instance and change
- the flag attribute.
-
- >>> def badhook(status, arg=None, kw1='no_kw1', kw2='no_kw2'):
- ... p.name = 'jul'
-
- Now register this hook and commit.
-
- >>> t.addAfterCommitHook(badhook, (p, 1))
- >>> transaction.commit()
-
- Nothing should have changed since it should have been aborted.
-
- >>> p.name
- 'julien'
-
- >>> db.close()
-
"""
def test_suite():
Modified: zope.transaction/trunk/transaction/tests/test_weakset.py
===================================================================
--- zope.transaction/trunk/transaction/tests/test_weakset.py 2007-11-09 16:27:01 UTC (rev 81643)
+++ zope.transaction/trunk/transaction/tests/test_weakset.py 2007-11-09 16:27:32 UTC (rev 81644)
@@ -13,7 +13,7 @@
##############################################################################
import unittest
-from zope.transaction.weakset import WeakSet
+from transaction.weakset import WeakSet
class Dummy:
pass
More information about the Checkins
mailing list