aboutsummaryrefslogtreecommitdiffstats
path: root/netlib
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2016-05-28 13:09:35 +1200
committerAldo Cortesi <aldo@nullcube.com>2016-05-28 13:09:35 +1200
commit735bbe52e10f2f11275942db0ded8cb681f4b60d (patch)
treee769c1e3842d7256858b43c754661acd17579c7e /netlib
parent804e04ef4392f72d25999926a59353eabf33336b (diff)
parent3a9e03ea1eaacd8b8428500578831d2b355a1522 (diff)
downloadmitmproxy-735bbe52e10f2f11275942db0ded8cb681f4b60d.tar.gz
mitmproxy-735bbe52e10f2f11275942db0ded8cb681f4b60d.tar.bz2
mitmproxy-735bbe52e10f2f11275942db0ded8cb681f4b60d.zip
Merge branch 'master' into solidcore
Diffstat (limited to 'netlib')
-rw-r--r--netlib/multidict.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/netlib/multidict.py b/netlib/multidict.py
index 248acdec..8e657363 100644
--- a/netlib/multidict.py
+++ b/netlib/multidict.py
@@ -213,7 +213,9 @@ class _MultiDict(MutableMapping, Serializable):
class MultiDict(_MultiDict):
def __init__(self, fields=None):
super(MultiDict, self).__init__()
- self.fields = tuple(fields) if fields else tuple() # type: Tuple[Tuple[bytes, bytes], ...]
+ self.fields = tuple(
+ [tuple(i) for i in fields or ()]
+ )
@six.add_metaclass(ABCMeta)