Log message for revision 30550:
  Merge rev 30547 from Zope-2_8-branch.
  
  Use ZODB 3.4b3.
  
  Stop using deprecated txn_mgr= argument; use
  transaction_manager= instead.  Stop "illegal" use of
  Connection's private ._txn_mgr attribute; use the new
  public .transaction_manager attribute instead.
  

Changed:
  _U  Zope/trunk/lib/python/
  U   Zope/trunk/lib/python/Products/ZODBMountPoint/Mount.py
  U   Zope/trunk/lib/python/ZClasses/ZClass.txt
  U   Zope/trunk/lib/python/ZClasses/_pmc.txt
  _U  Zope/trunk/utilities/

-=-

Property changes on: Zope/trunk/lib/python
___________________________________________________________________
Name: svn:externals
   - zope           
svn://svn.zope.org/repos/main/Zope3/tags/ZopeX3-3.0.0-Zope-2.8-a4/src/zope
ZConfig        svn://svn.zope.org/repos/main/ZConfig/tags/ZConfig-2.3
BTrees         svn://svn.zope.org/repos/main/ZODB/tags/3.4.0b1/src/BTrees
Persistence    svn://svn.zope.org/repos/main/ZODB/tags/3.4.0b1/src/Persistence
persistent     svn://svn.zope.org/repos/main/ZODB/tags/3.4.0b1/src/persistent
ThreadedAsync  svn://svn.zope.org/repos/main/ZODB/tags/3.4.0b1/src/ThreadedAsync
transaction    svn://svn.zope.org/repos/main/ZODB/tags/3.4.0b1/src/transaction
ZEO            svn://svn.zope.org/repos/main/ZODB/tags/3.4.0b1/src/ZEO
ZODB           svn://svn.zope.org/repos/main/ZODB/tags/3.4.0b1/src/ZODB
ZopeUndo       svn://svn.zope.org/repos/main/ZODB/tags/3.4.0b1/src/ZopeUndo

   + zope           
svn://svn.zope.org/repos/main/Zope3/tags/ZopeX3-3.0.0-Zope-2.8-a4/src/zope
ZConfig        svn://svn.zope.org/repos/main/ZConfig/tags/ZConfig-2.3
BTrees         svn://svn.zope.org/repos/main/ZODB/tags/3.4.0b3/src/BTrees
Persistence    svn://svn.zope.org/repos/main/ZODB/tags/3.4.0b3/src/Persistence
persistent     svn://svn.zope.org/repos/main/ZODB/tags/3.4.0b3/src/persistent
ThreadedAsync  svn://svn.zope.org/repos/main/ZODB/tags/3.4.0b3/src/ThreadedAsync
transaction    svn://svn.zope.org/repos/main/ZODB/tags/3.4.0b3/src/transaction
ZEO            svn://svn.zope.org/repos/main/ZODB/tags/3.4.0b3/src/ZEO
ZODB           svn://svn.zope.org/repos/main/ZODB/tags/3.4.0b3/src/ZODB
ZopeUndo       svn://svn.zope.org/repos/main/ZODB/tags/3.4.0b3/src/ZopeUndo


Modified: Zope/trunk/lib/python/Products/ZODBMountPoint/Mount.py
===================================================================
--- Zope/trunk/lib/python/Products/ZODBMountPoint/Mount.py      2005-05-27 
21:42:32 UTC (rev 30549)
+++ Zope/trunk/lib/python/Products/ZODBMountPoint/Mount.py      2005-05-27 
21:59:02 UTC (rev 30550)
@@ -209,7 +209,7 @@
                 # collector #1350: ensure that the connection is unregistered
                 # from the transaction manager (XXX API method?)
                 if conn._synch:
-                    conn._txn_mgr.unregisterSynch(conn)
+                    conn.transaction_manager.unregisterSynch(conn)
 
                 # The mounted connection keeps a reference to
                 # its database, but nothing else.

Modified: Zope/trunk/lib/python/ZClasses/ZClass.txt
===================================================================
--- Zope/trunk/lib/python/ZClasses/ZClass.txt   2005-05-27 21:42:32 UTC (rev 
30549)
+++ Zope/trunk/lib/python/ZClasses/ZClass.txt   2005-05-27 21:59:02 UTC (rev 
30550)
@@ -76,7 +76,7 @@
 creating a separate thread:
 
     >>> tm2 = transaction.TransactionManager()
-    >>> conn2 = some_database.open(txn_mgr=tm2)
+    >>> conn2 = some_database.open(transaction_manager=tm2)
     >>> app2 = conn2.root()['Application']
     >>> test2 = app2.Control_Panel.Products['test']
     >>> c2 = test2.C()

Modified: Zope/trunk/lib/python/ZClasses/_pmc.txt
===================================================================
--- Zope/trunk/lib/python/ZClasses/_pmc.txt     2005-05-27 21:42:32 UTC (rev 
30549)
+++ Zope/trunk/lib/python/ZClasses/_pmc.txt     2005-05-27 21:59:02 UTC (rev 
30550)
@@ -78,7 +78,7 @@
 
     >>> import transaction
     >>> tm = transaction.TransactionManager()
-    >>> connection = some_database.open(txn_mgr=tm)
+    >>> connection = some_database.open(transaction_manager=tm)
     >>> connection.root()['C'] = C
     >>> tm.commit()
 
@@ -125,7 +125,7 @@
 We can open another connection and access the class there.
 
     >>> tm2 = transaction.TransactionManager()
-    >>> connection2 = some_database.open(txn_mgr=tm2)
+    >>> connection2 = some_database.open(transaction_manager=tm2)
 
     >>> C2 = connection2.root()['C']
     >>> c2 = C2('other')
@@ -245,8 +245,8 @@
 connection pool:
 
     >>> old = connection, connection2
-    >>> connection = some_database.open(txn_mgr=tm)
-    >>> connection2 = some_database.open(txn_mgr=tm2)
+    >>> connection = some_database.open(transaction_manager=tm)
+    >>> connection2 = some_database.open(transaction_manager=tm2)
    
 Now, we can read the object:
 


Property changes on: Zope/trunk/utilities
___________________________________________________________________
Name: svn:externals
   - ZODBTools      svn://svn.zope.org/repos/main/ZODB/tags/3.4.0b1/src/scripts

   + ZODBTools      svn://svn.zope.org/repos/main/ZODB/tags/3.4.0b3/src/scripts


_______________________________________________
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

Reply via email to