diff options
| author | Aldo Cortesi <aldo@corte.si> | 2016-05-31 21:03:42 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@corte.si> | 2016-05-31 21:03:42 +1200 |
| commit | a7abf8b731658b4e7ed8705f7a94a6a62f08d51d (patch) | |
| tree | cb86e2e483530f5e1e8b0c5d60839de21fcf7390 /netlib/odict.py | |
| parent | 2f526393d29b6a03e43d1f6240175b4dfb13dc7d (diff) | |
| parent | 4da125b6a098cc0fd8b1fd2878584beb5df75c6c (diff) | |
| download | mitmproxy-a7abf8b731658b4e7ed8705f7a94a6a62f08d51d.tar.gz mitmproxy-a7abf8b731658b4e7ed8705f7a94a6a62f08d51d.tar.bz2 mitmproxy-a7abf8b731658b4e7ed8705f7a94a6a62f08d51d.zip | |
Merge pull request #1179 from cortesi/reorg
Start reorganising */utils.py
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 |