[Zope3-checkins] CVS: Zope3/src/zope/app/container/tests - test_contained.py:1.6

[Jeremy Hylton]

Update of /cvs-repository/Zope3/src/zope/app/container/tests
In directory cvs.zope.org:/tmp/cvs-serv23866/src/zope/app/container/tests

Modified Files:
	test_contained.py 
Log Message:
Merge the jeremy-txn-branch to the head.

This branch introduces a new transaction API.  The key features are:
  - top-level functions in transaction -- get(), commit(), abort() 
  - explicit transaction manager objects
  - Transaction objects are used for exactly one transaction
  - support for transaction synchronizers

The changes here are still provisional, but we want to get them off an
obscure branch and onto the head for further development.


=== Zope3/src/zope/app/container/tests/test_contained.py 1.5 => 1.6 ===
--- Zope3/src/zope/app/container/tests/test_contained.py:1.5	Mon Mar 29 16:33:57 2004
+++ Zope3/src/zope/app/container/tests/test_contained.py	Wed Mar 31 22:56:55 2004
@@ -54,9 +54,9 @@
 def test_basic_persistent_w_non_persistent_proxied():
     """
     >>> p = ContainedProxy([1])
-    >>> p.__parent__ = 2;
+    >>> p.__parent__ = 2
     >>> p.__name__ = 'test'
-    >>> db = DB(DemoStorage('test_storage'));
+    >>> db = DB(DemoStorage('test_storage'))
     >>> c = db.open()
     >>> c.root()['p'] = p
     >>> get_transaction().commit()
@@ -110,7 +110,7 @@
 
     Now we'll save the data:
     
-    >>> db = DB(DemoStorage('test_storage'));
+    >>> db = DB(DemoStorage('test_storage'))
     >>> c1 = db.open()
     >>> c1.root()['parent'] = parent
     >>> c1.root()['other'] = other