Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-27 02:24:18 +00:00
Code Issues Projects Releases Wiki Activity

also accept bytes as arguments

Browse Source
This commit is contained in:
Maximilian Hils 2015-09-22 01:56:09 +02:00
parent f937522773
commit c7b8322500
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
netlib/http/headers.py
View File

@ -14,16 +14,16 @@ except ImportError: # Workaround for Python < 3.3
import six import six
from netlib.utils import always_byte_args from netlib.utils import always_byte_args, always_bytes
if six.PY2: if six.PY2:
_native = lambda x: x _native = lambda x: x
_asbytes = lambda x: x _always_bytes = lambda x: x
_always_byte_args = lambda x: x _always_byte_args = lambda x: x
else: else:
# While headers _should_ be ASCII, it's not uncommon for certain headers to be utf-8 encoded. # While headers _should_ be ASCII, it's not uncommon for certain headers to be utf-8 encoded.
_native = lambda x: x.decode("utf-8", "surrogateescape") _native = lambda x: x.decode("utf-8", "surrogateescape")
_asbytes = lambda x: x.encode("utf-8", "surrogateescape") _always_bytes = lambda x: always_bytes(x, "utf-8", "surrogateescape")
_always_byte_args = always_byte_args("utf-8", "surrogateescape") _always_byte_args = always_byte_args("utf-8", "surrogateescape")
@ -95,7 +95,7 @@ class Headers(MutableMapping, object):
# content_type -> content-type # content_type -> content-type
headers = { headers = {
_asbytes(name).replace(b"_", b"-"): value _always_bytes(name).replace(b"_", b"-"): value
for name, value in six.iteritems(headers) for name, value in six.iteritems(headers)
} }
self.update(headers) self.update(headers)
@ -183,7 +183,7 @@ class Headers(MutableMapping, object):
Explicitly set multiple headers for the given key. Explicitly set multiple headers for the given key.
See: :py:meth:`get_all` See: :py:meth:`get_all`
""" """
values = map(_asbytes, values) # _always_byte_args does not fix lists values = map(_always_bytes, values) # _always_byte_args does not fix lists
if name in self: if name in self:
del self[name] del self[name]
self.fields.extend( self.fields.extend(