diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2016-10-17 15:15:22 +1300 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2016-10-17 15:18:47 +1300 |
| commit | 8360f70024330eeeb5c53d29e4a05194f872b511 (patch) | |
| tree | 6bbdcfe54fcce1e41660ca07c9470f42debdec5b /netlib/multidict.py | |
| parent | 4918feb7252c76c95d85cd8b2b0334a22aaae274 (diff) | |
| download | mitmproxy-8360f70024330eeeb5c53d29e4a05194f872b511.tar.gz mitmproxy-8360f70024330eeeb5c53d29e4a05194f872b511.tar.bz2 mitmproxy-8360f70024330eeeb5c53d29e4a05194f872b511.zip | |
First-order conversion to Python3-only
- Zap various occurrences of Python2 in docs and scripts
- Remove six from netlib, and some other places where obvious project-wide
search and replace works.
Diffstat (limited to 'netlib/multidict.py')
| -rw-r--r-- | netlib/multidict.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/netlib/multidict.py b/netlib/multidict.py index e9fec155..b8626731 100644 --- a/netlib/multidict.py +++ b/netlib/multidict.py @@ -8,12 +8,10 @@ try: except ImportError: # pragma: no cover from collections import MutableMapping # Workaround for Python < 3.3 -import six from netlib import basetypes -@six.add_metaclass(ABCMeta) -class _MultiDict(MutableMapping, basetypes.Serializable): +class _MultiDict(MutableMapping, basetypes.Serializable, metaclass=ABCMeta): def __repr__(self): fields = ( repr(field) @@ -231,8 +229,7 @@ class MultiDict(_MultiDict): return key -@six.add_metaclass(ABCMeta) -class ImmutableMultiDict(MultiDict): +class ImmutableMultiDict(MultiDict, metaclass=ABCMeta): def _immutable(self, *_): raise TypeError('{} objects are immutable'.format(self.__class__.__name__)) |