diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2018-11-23 02:30:37 -0600 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2018-11-23 02:30:37 -0600 |
| commit | 2b665235e8ab5c910896c24a042f76b77fa778dc (patch) | |
| tree | 97b0ff9f80d43fbdf1f4b8d1123e5a8419fc9efc | |
| parent | f4744db053a0097f4ddefadb18881091eee1a136 (diff) | |
| parent | 19fc8ae86db7818376f5a9d11359c5f69e8dd747 (diff) | |
| download | cherrypy-git-2b665235e8ab5c910896c24a042f76b77fa778dc.tar.gz | |
Merge branch 'maint/17.x'
| -rw-r--r-- | CHANGES.rst | 6 | ||||
| -rw-r--r-- | cherrypy/test/test_static.py | 6 |
2 files changed, 11 insertions, 1 deletions
diff --git a/CHANGES.rst b/CHANGES.rst index 23e5e830..8dc1af56 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -14,6 +14,12 @@ v18.0.0 * Drop support for Python 3.4. +v17.4.1 +------- + +* :issue:`1738` via :pr:`1755`: Restore support for 'bytes' + in response headers (backport from v18.0.1). + v17.4.0 ------- diff --git a/cherrypy/test/test_static.py b/cherrypy/test/test_static.py index 76cffbd4..cdd821ae 100644 --- a/cherrypy/test/test_static.py +++ b/cherrypy/test/test_static.py @@ -19,6 +19,10 @@ from cherrypy.test import helper @pytest.fixture def unicode_filesystem(tmpdir): + _check_unicode_filesystem(tmpdir) + + +def _check_unicode_filesystem(tmpdir): filename = tmpdir / ntou('☃', 'utf-8') tmpl = 'File system encoding ({encoding}) cannot support unicode filenames' msg = tmpl.format(encoding=sys.getfilesystemencoding()) @@ -35,7 +39,7 @@ def ensure_unicode_filesystem(): """ tmpdir = py.path.local(tempfile.mkdtemp()) try: - unicode_filesystem(tmpdir) + _check_unicode_filesystem(tmpdir) finally: tmpdir.remove() |