diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2016-03-31 18:07:58 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2016-03-31 18:07:58 +0200 |
| commit | c788e18e03e22bccb7c08eb7ac8283f3732aa50d (patch) | |
| tree | 6cd4f99c6570a5c4e7f00a48f91cba147c5b4974 /netlib/http/headers.py | |
| parent | 5552b5e782deaa510ebb00f337e39e99ac452aae (diff) | |
| parent | de0f2cbcd349005a07679283befa2d209bd9d022 (diff) | |
| download | mitmproxy-c788e18e03e22bccb7c08eb7ac8283f3732aa50d.tar.gz mitmproxy-c788e18e03e22bccb7c08eb7ac8283f3732aa50d.tar.bz2 mitmproxy-c788e18e03e22bccb7c08eb7ac8283f3732aa50d.zip | |
Merge branch 'master' of https://github.com/mitmproxy/mitmproxy
Diffstat (limited to 'netlib/http/headers.py')
| -rw-r--r-- | netlib/http/headers.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/netlib/http/headers.py b/netlib/http/headers.py index 78404796..9b8fdae4 100644 --- a/netlib/http/headers.py +++ b/netlib/http/headers.py @@ -8,7 +8,7 @@ from __future__ import absolute_import, print_function, division import copy try: from collections.abc import MutableMapping -except ImportError: # pragma: nocover +except ImportError: # pragma: no cover from collections import MutableMapping # Workaround for Python < 3.3 @@ -16,7 +16,7 @@ import six from netlib.utils import always_byte_args, always_bytes, Serializable -if six.PY2: # pragma: nocover +if six.PY2: # pragma: no cover _native = lambda x: x _always_bytes = lambda x: x _always_byte_args = lambda x: x @@ -106,7 +106,7 @@ class Headers(MutableMapping, Serializable): else: return b"" - if six.PY2: # pragma: nocover + if six.PY2: # pragma: no cover __str__ = __bytes__ @_always_byte_args |