diff options
| author | Zohar Lorberbaum <zlorber@gmail.com> | 2016-03-28 10:03:26 -0700 |
|---|---|---|
| committer | Zohar Lorberbaum <zlorber@gmail.com> | 2016-03-28 10:03:26 -0700 |
| commit | 6d16f44ab723ef23a633b175c1cb4575919b07c4 (patch) | |
| tree | 2cf1d25543e4e81475aa97207d91a8629ce538dd /netlib/http/headers.py | |
| parent | e56198ae7cf5de1d00c799133d3257434072998e (diff) | |
| download | mitmproxy-6d16f44ab723ef23a633b175c1cb4575919b07c4.tar.gz mitmproxy-6d16f44ab723ef23a633b175c1cb4575919b07c4.tar.bz2 mitmproxy-6d16f44ab723ef23a633b175c1cb4575919b07c4.zip | |
Merge with master
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 |