Commit f6cdd6a0 authored by Jens's avatar Jens Committed by GitHub

Fix Issue 7: Prevent RuntimeError on _takeOutGarbage (#11)

* fix RuntimeError in py3
* move test requirements from tox.ini to setup.py
parent 5bd7f118
...@@ -10,6 +10,9 @@ Changelog ...@@ -10,6 +10,9 @@ Changelog
- Add support for Python 3.7. - Add support for Python 3.7.
- Avoid RuntimeError in _takeOutGarbage. See `issue 7
<https://github.com/zopefoundation/tempstorage/issues/7>`_.
4.0.1 (2017-11-27) 4.0.1 (2017-11-27)
------------------ ------------------
...@@ -27,11 +30,13 @@ Changelog ...@@ -27,11 +30,13 @@ Changelog
- Declare PyPy compatibility. - Declare PyPy compatibility.
3.0 - 2016-04-03 3.0 - 2016-04-03
---------------- ----------------
- Python 3.3-3.5 compatibility. - Python 3.3-3.5 compatibility.
2.12.2 - 2012-10-14 2.12.2 - 2012-10-14
------------------- -------------------
...@@ -44,6 +49,7 @@ Changelog ...@@ -44,6 +49,7 @@ Changelog
- Disabled ``check_tid_ordering_w_commit`` test from BasicStorage, as it uses - Disabled ``check_tid_ordering_w_commit`` test from BasicStorage, as it uses
invalid test data. invalid test data.
2.12.0 - 2010-09-25 2.12.0 - 2010-09-25
------------------- -------------------
...@@ -51,6 +57,7 @@ Changelog ...@@ -51,6 +57,7 @@ Changelog
- Expanded dependency on ZODB3 to include the test extra. - Expanded dependency on ZODB3 to include the test extra.
2.11.3 - 2010-06-05 2.11.3 - 2010-06-05
------------------- -------------------
...@@ -65,6 +72,7 @@ Changelog ...@@ -65,6 +72,7 @@ Changelog
- Fix a test failure due to never-unghostified root in second connection. - Fix a test failure due to never-unghostified root in second connection.
2.11.2 - 2009-08-03 2.11.2 - 2009-08-03
------------------- -------------------
...@@ -72,6 +80,7 @@ Changelog ...@@ -72,6 +80,7 @@ Changelog
- Lauchpad #143736, #271395: fixed AttributeError' on _ltid in TempStorage - Lauchpad #143736, #271395: fixed AttributeError' on _ltid in TempStorage
2.11.1 - 2008-08-05 2.11.1 - 2008-08-05
------------------- -------------------
......
...@@ -48,6 +48,12 @@ setup(name='tempstorage', ...@@ -48,6 +48,12 @@ setup(name='tempstorage',
'ZODB >= 5.0', 'ZODB >= 5.0',
'zope.testing', 'zope.testing',
], ],
extras_require={
'test': [
'mock',
'zope.testrunner'
],
},
include_package_data=True, include_package_data=True,
zip_safe=False, zip_safe=False,
keywords=['zope', 'plone', 'zodb'] keywords=['zope', 'plone', 'zodb']
......
...@@ -321,7 +321,7 @@ class TemporaryStorage(BaseStorage, ConflictResolvingStorage): ...@@ -321,7 +321,7 @@ class TemporaryStorage(BaseStorage, ConflictResolvingStorage):
pass pass
# remove this object from the conflict cache if it exists there # remove this object from the conflict cache if it exists there
for k in self._conflict_cache.keys(): for k in list(self._conflict_cache.keys()):
if k[0] == oid: if k[0] == oid:
del self._conflict_cache[k] del self._conflict_cache[k]
......
...@@ -7,6 +7,5 @@ commands = ...@@ -7,6 +7,5 @@ commands =
zope-testrunner --test-path=src --auto-color --auto-progress zope-testrunner --test-path=src --auto-color --auto-progress
deps = deps =
ZODB
zope.testing extras = test
zope.testrunner
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment