diff options
author | Aldo Cortesi <aldo@nullcube.com> | 2016-05-31 17:16:31 +1200 |
---|---|---|
committer | Aldo Cortesi <aldo@nullcube.com> | 2016-05-31 17:16:31 +1200 |
commit | 08fbe6f1118455bc44d05db30b83bdf81feda2a0 (patch) | |
tree | 38db5d8f3e1e52e09a9348d15db368ae3baa9b86 /netlib/odict.py | |
parent | 2f526393d29b6a03e43d1f6240175b4dfb13dc7d (diff) | |
download | mitmproxy-08fbe6f1118455bc44d05db30b83bdf81feda2a0.tar.gz mitmproxy-08fbe6f1118455bc44d05db30b83bdf81feda2a0.tar.bz2 mitmproxy-08fbe6f1118455bc44d05db30b83bdf81feda2a0.zip |
Start cleaning up netlib.utils
- Remove http2 functions, move to http2.frame
- Remove Serializable, move to netlib.basetypes
Diffstat (limited to 'netlib/odict.py')
-rw-r--r-- | netlib/odict.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/netlib/odict.py b/netlib/odict.py index 8a638dab..87887a29 100644 --- a/netlib/odict.py +++ b/netlib/odict.py @@ -3,10 +3,10 @@ import copy import six -from .utils import Serializable, safe_subn +from . import basetypes, utils -class ODict(Serializable): +class ODict(basetypes.Serializable): """ A dictionary-like object for managing ordered (key, value) data. Think @@ -139,9 +139,9 @@ class ODict(Serializable): """ new, count = [], 0 for k, v in self.lst: - k, c = safe_subn(pattern, repl, k, *args, **kwargs) + k, c = utils.safe_subn(pattern, repl, k, *args, **kwargs) count += c - v, c = safe_subn(pattern, repl, v, *args, **kwargs) + v, c = utils.safe_subn(pattern, repl, v, *args, **kwargs) count += c new.append([k, v]) self.lst = new |