diff options
| author | Jason Madden <jason+github@nextthought.com> | 2017-12-19 09:19:16 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-19 09:19:16 -0600 |
| commit | c595e7fbf03e095ee9ac59e1d15b1e8cae2cd9ee (patch) | |
| tree | e4455f354ba9d94b9c7af12ef84a35ebc64cef5f | |
| parent | 60a135be7bfe3e84cf1e76cd50cea20c879b43e5 (diff) | |
| parent | e006c63af5d70087e316faddbd053196d24e19c8 (diff) | |
| download | zope-i18n-c595e7fbf03e095ee9ac59e1d15b1e8cae2cd9ee.tar.gz | |
Merge pull request #32 from zopefoundation/issue30
Do not extend CleanUp.
| -rw-r--r-- | CHANGES.rst | 5 | ||||
| -rw-r--r-- | src/zope/i18n/testing.py | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/CHANGES.rst b/CHANGES.rst index 7a1de94..cfee7d3 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,7 +5,10 @@ 4.3.1 (unreleased) ================== -- Nothing changed yet. +- Make ``PlacelessSetup`` not extend ``zope.testing.cleanup.CleanUp``. + Extending ``CleanUp`` was introduced in 4.3.0 but turned out to have + unexpected consequences. See `issue 30 + <https://github.com/zopefoundation/zope.i18n/issues/30>`_. 4.3.0 (2017-12-18) diff --git a/src/zope/i18n/testing.py b/src/zope/i18n/testing.py index de5d0e4..035827c 100644 --- a/src/zope/i18n/testing.py +++ b/src/zope/i18n/testing.py @@ -19,7 +19,6 @@ This relies on :mod:`zope.publisher` being available. import re -from zope.testing.cleanup import CleanUp from zope.testing import renormalizing rules = [] @@ -39,7 +38,7 @@ def setUp(test=None): zope.component.provideAdapter(BrowserLanguages) -class PlacelessSetup(CleanUp): +class PlacelessSetup(object): def setUp(self): """ @@ -56,5 +55,4 @@ class PlacelessSetup(CleanUp): <zope.publisher.browser.BrowserLanguages ...> """ - super(PlacelessSetup, self).setUp() setUp() |