adapt to changes in transaction and ZODB

zopefoundation · Oct 24, 2018 · 950a785 · 950a785
1 parent c6f2573
commit 950a785
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/ZPublisher/WSGIPublisher.py b/src/ZPublisher/WSGIPublisher.py
@@ -223,7 +223,7 @@ def load_app(module_info):
     try:
         yield (app, realm, debug_mode)
     finally:
-        if transaction.manager._txn is not None:
+        if transaction.manager.manager._txn is not None:
             # Only abort a transaction, if one exists. Otherwise the
             # abort creates a new transaction just to abort it.
             transaction.abort()

diff --git a/src/ZPublisher/tests/test_WSGIPublisher.py b/src/ZPublisher/tests/test_WSGIPublisher.py
@@ -584,10 +584,10 @@ def test_open_transaction_is_aborted(self):
         load_app = self._getTarget()
 
         transaction.begin()
-        self.assertIsNotNone(transaction.manager._txn)
+        self.assertIsNotNone(transaction.manager.manager._txn)
         with load_app(self._makeModuleInfo()):
             pass
-        self.assertIsNone(transaction.manager._txn)
+        self.assertIsNone(transaction.manager.manager._txn)
 
     def test_no_second_transaction_is_created_if_closed(self):
         load_app = self._getTarget()