- stop using the Surrogate class

zopefoundation · Feb 25, 2020 · 645d781 · 645d781
1 parent af1a412
commit 645d781
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/Shared/DC/ZRDB/THUNK.py b/src/Shared/DC/ZRDB/THUNK.py
@@ -20,7 +20,6 @@
 from zope.interface import implementer
 
 from .TM import TM
-from .TM import Surrogate
 
 
 LOG = logging.getLogger('Products.ZSQLMethods')
@@ -37,7 +36,7 @@ def _register(self):
             thunk_lock.acquire()
 
             try:
-                self.transaction_manager.get().join(Surrogate(self))
+                self.transaction_manager.get().join(self)
             except TransactionFailedError:
                 LOG.error('Failed to join transaction: ', exc_info=True)
                 # No need to raise here, the transaction is already

diff --git a/src/Shared/DC/ZRDB/TM.py b/src/Shared/DC/ZRDB/TM.py
@@ -47,7 +47,7 @@ def _begin(self):
     def _register(self):
         if not self._registered:
             try:
-                self.transaction_manager.get().join(Surrogate(self))
+                self.transaction_manager.get().join(self)
             except TransactionFailedError:
                 LOG.error('Failed to join transaction: ', exc_info=True)
                 # No need to raise here, the transaction is already
@@ -83,13 +83,16 @@ def tpc_finish(self, *ignored):
             finally:
                 self._registered = 0
 
+    __inform_commit__ = tpc_finish
+
     def abort(self, *ignored):
         try:
             self._abort()
         finally:
             self._registered = 0
 
     tpc_abort = abort
+    __inform_abort__ = abort
 
     # Most DA's talking to RDBMS systems do not care about commit order, so
     # return a constant. Must be a string according to ITransactionManager.