Merge branch 'master' into solidcore

This commit is contained in:
Aldo Cortesi 2016-05-28 13:09:35 +12:00
commit 735bbe52e1

View File

@ -213,7 +213,9 @@ class _MultiDict(MutableMapping, Serializable):
class MultiDict(_MultiDict): class MultiDict(_MultiDict):
def __init__(self, fields=None): def __init__(self, fields=None):
super(MultiDict, self).__init__() 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) @six.add_metaclass(ABCMeta)