diff options
author | Maximilian Hils <git@maximilianhils.com> | 2014-01-30 20:07:30 +0100 |
---|---|---|
committer | Maximilian Hils <git@maximilianhils.com> | 2014-01-30 20:07:30 +0100 |
commit | ff9656be80192ac837cf98997f9fe6c00c9c5a32 (patch) | |
tree | 1f8a1f8c823770323a4a3e2a9e5fe56add6210b7 /netlib/odict.py | |
parent | e18ac4b672e8645388dc8057801092ce417f1511 (diff) | |
download | mitmproxy-ff9656be80192ac837cf98997f9fe6c00c9c5a32.tar.gz mitmproxy-ff9656be80192ac837cf98997f9fe6c00c9c5a32.tar.bz2 mitmproxy-ff9656be80192ac837cf98997f9fe6c00c9c5a32.zip |
remove subclassing of tuple in tcp.Address, move StateObject into netlib
Diffstat (limited to 'netlib/odict.py')
-rw-r--r-- | netlib/odict.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/netlib/odict.py b/netlib/odict.py index 0759a5bf..8e195afc 100644 --- a/netlib/odict.py +++ b/netlib/odict.py @@ -1,4 +1,6 @@ import re, copy +from netlib.stateobject import StateObject + def safe_subn(pattern, repl, target, *args, **kwargs): """ @@ -9,7 +11,7 @@ def safe_subn(pattern, repl, target, *args, **kwargs): return re.subn(str(pattern), str(repl), target, *args, **kwargs) -class ODict: +class ODict(StateObject): """ A dictionary-like object for managing ordered (key, value) data. """ @@ -98,6 +100,9 @@ class ODict: def _get_state(self): return [tuple(i) for i in self.lst] + def _load_state(self, state): + self.list = [list(i) for i in state] + @classmethod def _from_state(klass, state): return klass([list(i) for i in state]) |