aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy/stateobject.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2016-10-17 16:20:35 +1300
committerAldo Cortesi <aldo@nullcube.com>2016-10-17 16:22:44 +1300
commit839813a84c3d63ca44d2721f6cb39b79c489195a (patch)
treed4cc5f86191dfef1c454ae51d2fa639b91e79cf3 /mitmproxy/stateobject.py
parentd60ef617e33211cee3808c8b145d576f34ff437a (diff)
downloadmitmproxy-839813a84c3d63ca44d2721f6cb39b79c489195a.tar.gz
mitmproxy-839813a84c3d63ca44d2721f6cb39b79c489195a.tar.bz2
mitmproxy-839813a84c3d63ca44d2721f6cb39b79c489195a.zip
mitmproxy: zap six
Diffstat (limited to 'mitmproxy/stateobject.py')
-rw-r--r--mitmproxy/stateobject.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/mitmproxy/stateobject.py b/mitmproxy/stateobject.py
index 5e4ae6e3..a38315c1 100644
--- a/mitmproxy/stateobject.py
+++ b/mitmproxy/stateobject.py
@@ -1,6 +1,5 @@
from __future__ import absolute_import, print_function, division
-import six
from typing import Any
from typing import List
@@ -34,7 +33,7 @@ class StateObject(netlib.basetypes.Serializable):
Retrieve object state.
"""
state = {}
- for attr, cls in six.iteritems(self._stateobject_attributes):
+ for attr, cls in self._stateobject_attributes.items():
val = getattr(self, attr)
if val is None:
state[attr] = None
@@ -51,7 +50,7 @@ class StateObject(netlib.basetypes.Serializable):
Load object state from data returned by a get_state call.
"""
state = state.copy()
- for attr, cls in six.iteritems(self._stateobject_attributes):
+ for attr, cls in self._stateobject_attributes.items():
val = state.pop(attr)
if val is None:
setattr(self, attr, val)