diff options
author | Maximilian Hils <git@maximilianhils.com> | 2016-03-20 19:56:22 +0100 |
---|---|---|
committer | Maximilian Hils <git@maximilianhils.com> | 2016-03-20 19:56:22 +0100 |
commit | 6f902ffbb3067350da3da01d923e4351d63f604a (patch) | |
tree | fbcb2c6e4db5f487448df80267a7bff3bb5c55f4 /mitmproxy/stateobject.py | |
parent | 88d365cfe671bc5c8d96e78334337aa84cc815da (diff) | |
download | mitmproxy-6f902ffbb3067350da3da01d923e4351d63f604a.tar.gz mitmproxy-6f902ffbb3067350da3da01d923e4351d63f604a.tar.bz2 mitmproxy-6f902ffbb3067350da3da01d923e4351d63f604a.zip |
py3++: iteritems
Diffstat (limited to 'mitmproxy/stateobject.py')
-rw-r--r-- | mitmproxy/stateobject.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mitmproxy/stateobject.py b/mitmproxy/stateobject.py index a4a1ffda..fff6e116 100644 --- a/mitmproxy/stateobject.py +++ b/mitmproxy/stateobject.py @@ -1,4 +1,7 @@ from __future__ import absolute_import + +import six + from netlib.utils import Serializable @@ -23,7 +26,7 @@ class StateObject(Serializable): Retrieve object state. """ state = {} - for attr, cls in self._stateobject_attributes.iteritems(): + for attr, cls in six.iteritems(self._stateobject_attributes): val = getattr(self, attr) if hasattr(val, "get_state"): state[attr] = val.get_state() @@ -36,7 +39,7 @@ class StateObject(Serializable): Load object state from data returned by a get_state call. """ state = state.copy() - for attr, cls in self._stateobject_attributes.iteritems(): + for attr, cls in six.iteritems(self._stateobject_attributes): if state.get(attr) is None: setattr(self, attr, state.pop(attr)) else: |