[Checkins] SVN: zc.twist/branches/benji-make-work-with-zodb-3.8/s checkpoint nearly working code

[Benji York]

Log message for revision 77194:
  checkpoint nearly working code
  

Changed:
  U   zc.twist/branches/benji-make-work-with-zodb-3.8/setup.py
  U   zc.twist/branches/benji-make-work-with-zodb-3.8/src/zc/twist/__init__.py

-=-
Modified: zc.twist/branches/benji-make-work-with-zodb-3.8/setup.py
===================================================================
--- zc.twist/branches/benji-make-work-with-zodb-3.8/setup.py	2007-06-28 21:05:06 UTC (rev 77193)
+++ zc.twist/branches/benji-make-work-with-zodb-3.8/setup.py	2007-06-28 21:05:41 UTC (rev 77194)
@@ -13,7 +13,7 @@
     description='Mixing Twisted and ZODB',
     license='ZPL',
     install_requires=[
-        'ZODB3 ==3.7',
+        'ZODB3',
         'zope.component',
         'setuptools',
         'twisted ==2.1dev',

Modified: zc.twist/branches/benji-make-work-with-zodb-3.8/src/zc/twist/__init__.py
===================================================================
--- zc.twist/branches/benji-make-work-with-zodb-3.8/src/zc/twist/__init__.py	2007-06-28 21:05:06 UTC (rev 77193)
+++ zc.twist/branches/benji-make-work-with-zodb-3.8/src/zc/twist/__init__.py	2007-06-28 21:05:41 UTC (rev 77194)
@@ -1,5 +1,6 @@
 import random
 import types
+import warnings
 
 import ZODB.interfaces
 import ZODB.POSException
@@ -75,8 +76,17 @@
         available = len(pool.available) + (size - all)
         return available
 
-def get_connection(db, mvcc=True, version='', synch=True,
+missing = object()
+
+def get_connection(db, mvcc=missing, version=missing, synch=missing,
                    deferred=None, backoff=None):
+
+    if mvcc is not missing:
+        warnings.warn('the mvcc parameter is now ignored')
+    if version is not missing:
+        warnings.warn('the version parameter is now ignored')
+    if synch is not missing:
+        warnings.warn('the synch parameter is now ignored')
     if deferred is None:
         deferred = twisted.internet.defer.Deferred()
     if backoff is None:
@@ -90,13 +100,10 @@
     # later.
     if backoff < .5 and not availableConnectionCount(db):
         twisted.internet.reactor.callLater(
-            backoff, get_connection, db, mvcc, version, synch,
-            deferred, backoff)
+            backoff, get_connection, db, deferred, backoff)
         return deferred
-    deferred.callback(
-        db.open(version=version, mvcc=mvcc,
-                transaction_manager=transaction.TransactionManager(),
-                synch=synch))
+    deferred.callback(db.open(
+        transaction_manager=transaction.TransactionManager()))
     return deferred
 
 def sanitize(failure):
@@ -109,9 +116,6 @@
 class Partial(object):
 
     attempt_count = 0
-    mvcc = True
-    version = ''
-    synch = True
 
     def __init__(self, call, *args, **kwargs):
         self.call = Reference(call)
@@ -135,8 +139,7 @@
             return call(*args, **kwargs)
         self.attempt_count = 0
         d = twisted.internet.defer.Deferred()
-        get_connection(db, self.mvcc, self.version, self.synch
-                      ).addCallback(self._call, d)
+        get_connection(db).addCallback(self._call, d)
         return d
 
     def _resolve(self, conn):