From 19d3d07ae5674fba9f1da454a15bb21f10997570 Mon Sep 17 00:00:00 2001
From: Michael Howitz <mh@gocept.com>
Date: Wed, 24 Oct 2018 08:14:24 +0200
Subject: [PATCH] Use new transaction release to get the fix for
 zopefoundation/ZODB#208.

---
 CHANGES.rst                                | 4 ++++
 constraints.txt                            | 2 +-
 requirements-full.txt                      | 2 +-
 setup.py                                   | 2 +-
 src/ZPublisher/tests/test_WSGIPublisher.py | 4 ++--
 versions-prod.cfg                          | 2 +-
 6 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index e8d4953bcc..94c63196a1 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -28,6 +28,10 @@ Bugfixes
   stdlib in Python 3.
   (`#368 <https://github.com/zopefoundation/Zope/issues/368>`_)
 
+- Fix KeyError on releasing resources of a Connection when closing the DB.
+  This requires at least version 2.4 of the `transaction` package.
+  See `issue 208 <https://github.com/zopefoundation/ZODB/issues/208>`.
+
 - Fix rendering of ordered folder icon in ZMI.
 
 Other changes
diff --git a/constraints.txt b/constraints.txt
index 4a72252572..959fd7a995 100644
--- a/constraints.txt
+++ b/constraints.txt
@@ -34,7 +34,7 @@ persistent==4.4.3
 pytz==2018.5
 shutilwhich==1.1.0
 six==1.11.0
-transaction==2.3.0
+transaction==2.4.0
 waitress==1.1.0
 z3c.pt==3.1.0
 zExceptions==4.1
diff --git a/requirements-full.txt b/requirements-full.txt
index 1eff27d1dc..5daa26664a 100644
--- a/requirements-full.txt
+++ b/requirements-full.txt
@@ -34,7 +34,7 @@ persistent==4.4.3
 pytz==2018.5
 shutilwhich==1.1.0
 six==1.11.0
-transaction==2.3.0
+transaction==2.4.0
 waitress==1.1.0
 z3c.pt==3.1.0
 zExceptions==4.1
diff --git a/setup.py b/setup.py
index b70e09ef06..94ba48a5a4 100644
--- a/setup.py
+++ b/setup.py
@@ -78,7 +78,7 @@ def _read_file(filename):
         'ipaddress ; python_version=="2.7"',
         'setuptools >= 36.2',
         'six',
-        'transaction',
+        'transaction >= 2.4',
         'waitress',
         'zExceptions >= 3.4',
         'z3c.pt',
diff --git a/src/ZPublisher/tests/test_WSGIPublisher.py b/src/ZPublisher/tests/test_WSGIPublisher.py
index 4f47872e76..c1c5eeee32 100644
--- a/src/ZPublisher/tests/test_WSGIPublisher.py
+++ b/src/ZPublisher/tests/test_WSGIPublisher.py
@@ -615,11 +615,11 @@ def counts(self):
         transaction.manager.registerSynch(counter)
 
         transaction.begin()
-        self.assertIsNotNone(transaction.manager._txn)
+        self.assertIsNotNone(transaction.manager.manager._txn)
         with load_app(self._makeModuleInfo()):
             transaction.abort()
 
-        self.assertIsNone(transaction.manager._txn)
+        self.assertIsNone(transaction.manager.manager._txn)
         self.assertEqual(counter.counts(), (1, 1))
 
 
diff --git a/versions-prod.cfg b/versions-prod.cfg
index 46e74af3a6..3bdbe080ad 100644
--- a/versions-prod.cfg
+++ b/versions-prod.cfg
@@ -32,7 +32,7 @@ Record = 3.5
 RestrictedPython = 4.0b6
 shutilwhich = 1.1.0
 six = 1.11.0
-transaction = 2.3.0
+transaction = 2.4.0
 waitress = 1.1.0
 WebOb = 1.8.3
 WebTest = 2.0.32