diff --git a/CHANGES.rst b/CHANGES.rst index 37e54fd..d478a95 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,7 +5,8 @@ CHANGES 5.3 (unreleased) ---------------- -- Pin to `WebTest < 2.0.27` as newer versions break some tests. +- Exclude version 2.0.27 of `WebTest` from allowed versions as it breaks some + tests. 5.2 (2017-02-25) diff --git a/setup.py b/setup.py index f28d877..76b2fe9 100644 --- a/setup.py +++ b/setup.py @@ -60,7 +60,7 @@ 'zope.schema', 'zope.cachedescriptors', 'pytz > dev', - 'WebTest >= 2.0.9, < 2.0.27', + 'WebTest >= 2.0.9, != 2.0.27', 'WSGIProxy2', 'six', ], diff --git a/src/zope/testbrowser/ftests/wsgitestapp.py b/src/zope/testbrowser/ftests/wsgitestapp.py index 0de6305..a62a311 100644 --- a/src/zope/testbrowser/ftests/wsgitestapp.py +++ b/src/zope/testbrowser/ftests/wsgitestapp.py @@ -131,6 +131,10 @@ def set_header(req): resp = Response() body = [u"Set Headers:"] for k, v in sorted(req.params.items()): + if not isinstance(k, str): + k = k.encode('latin1') + if not isinstance(v, str): + v = v.encode('latin1') body.extend([k, v]) resp.headers.add(k, v) resp.unicode_body = u'\n'.join(body)