diff options
| author | Sviatoslav Sydorenko <wk@sydorenko.org.ua> | 2020-11-15 02:58:49 +0100 |
|---|---|---|
| committer | Sviatoslav Sydorenko <wk@sydorenko.org.ua> | 2020-11-15 03:32:42 +0100 |
| commit | 3b642b19937eafa8135a59c9bf38cd37f0a57e87 (patch) | |
| tree | 48d774876711c91bf62605b80953a238444499bd /cherrypy/test/test_tools.py | |
| parent | 5c8258371d4a53ef939b7a38d1b1fbaf362e6078 (diff) | |
| download | cherrypy-git-maint/17.x.tar.gz | |
Merge branch 'bugfixes/1849-gzip-compression-header-cpython-bug39389'maint/17.x
This change implements a fix to compression in gzip tool that CPython
applied per https://bugs.python.org/issue39389. It uses proper XFL
value in gzip header per https://tools.ietf.org/html/rfc1952, section
2.3.1.
Refs:
* https://github.com/python/cpython/pull/18077 (CPython 3.9.0+)
* https://github.com/python/cpython/pull/18100 (CPython 3.8.2+)
* https://github.com/python/cpython/pull/18101 (CPython 3.7.7+)
Fixes #1849
(cherry picked from commit 3925ae9dffb3d0b8d7792ccd1fd8fefae6f20089)
Diffstat (limited to 'cherrypy/test/test_tools.py')
| -rw-r--r-- | cherrypy/test/test_tools.py | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/cherrypy/test/test_tools.py b/cherrypy/test/test_tools.py index a73a3898..dbed9faf 100644 --- a/cherrypy/test/test_tools.py +++ b/cherrypy/test/test_tools.py @@ -18,6 +18,17 @@ from cherrypy._cpcompat import ntou from cherrypy.test import helper, _test_decorators +PY_VER_PATCH = sys.version_info[:3] +PY_VER_MINOR = PY_VER_PATCH[:2] +# Refs: +# bugs.python.org/issue39389 +# docs.python.org/3.7/whatsnew/changelog.html#python-3-7-7-release-candidate-1 +# docs.python.org/3.8/whatsnew/changelog.html#python-3-8-2-release-candidate-1 +HAS_GZIP_COMPRESSION_HEADER_FIXED = PY_VER_PATCH >= (3, 8, 2) or ( + PY_VER_MINOR == (3, 7) and PY_VER_PATCH >= (3, 7, 7) +) + + timeout = 0.2 europoundUnicode = ntou('\x80\xa3') @@ -363,6 +374,13 @@ class ToolTests(helper.CPWebCase): ('Accept-Charset', 'ISO-8859-1,utf-8;q=0.7,*;q=0.7')]) self.assertInBody(zbuf.getvalue()[:3]) + if not HAS_GZIP_COMPRESSION_HEADER_FIXED: + # NOTE: CherryPy adopts a fix from the CPython bug 39389 + # NOTE: introducing a variable compression XFL flag that + # NOTE: was hardcoded to "best compression" before. And so + # NOTE: we can only test it on CPython versions that also + # NOTE: implement this fix. + return zbuf = io.BytesIO() zfile = gzip.GzipFile(mode='wb', fileobj=zbuf, compresslevel=6) zfile.write(expectedResult) |