summaryrefslogtreecommitdiff
path: root/cherrypy/lib/encoding.py
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2018-02-04 13:11:20 -0500
committerJason R. Coombs <jaraco@jaraco.com>2018-02-04 13:44:14 -0500
commitc314adc4deb7cd43aa985ce2541e39588e4098cb (patch)
treedaedd192da82551b82846fa2ee052ba3422bc9ab /cherrypy/lib/encoding.py
parent513d4bfef99e7e599bc60c7da745d18439567797 (diff)
downloadcherrypy-git-c314adc4deb7cd43aa985ce2541e39588e4098cb.tar.gz
Use bytes literals where appropriatev14.0.0
Diffstat (limited to 'cherrypy/lib/encoding.py')
-rw-r--r--cherrypy/lib/encoding.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/cherrypy/lib/encoding.py b/cherrypy/lib/encoding.py
index 72e58f9c..0fc15225 100644
--- a/cherrypy/lib/encoding.py
+++ b/cherrypy/lib/encoding.py
@@ -5,7 +5,7 @@ import io
import six
import cherrypy
-from cherrypy._cpcompat import text_or_bytes, ntob
+from cherrypy._cpcompat import text_or_bytes
from cherrypy.lib import file_generator
from cherrypy.lib import is_closable_iterator
from cherrypy.lib import set_vary_header
@@ -277,15 +277,15 @@ def compress(body, compress_level):
import zlib
# See http://www.gzip.org/zlib/rfc-gzip.html
- yield ntob('\x1f\x8b') # ID1 and ID2: gzip marker
- yield ntob('\x08') # CM: compression method
- yield ntob('\x00') # FLG: none set
+ yield b'\x1f\x8b' # ID1 and ID2: gzip marker
+ yield b'\x08' # CM: compression method
+ yield b'\x00' # FLG: none set
# MTIME: 4 bytes
yield struct.pack('<L', int(time.time()) & int('FFFFFFFF', 16))
- yield ntob('\x02') # XFL: max compression, slowest algo
- yield ntob('\xff') # OS: unknown
+ yield b'\x02' # XFL: max compression, slowest algo
+ yield b'\xff' # OS: unknown
- crc = zlib.crc32(ntob(''))
+ crc = zlib.crc32(b'')
size = 0
zobj = zlib.compressobj(compress_level,
zlib.DEFLATED, -zlib.MAX_WBITS,