diff options
| author | Aldo Cortesi <aldo@corte.si> | 2016-06-02 13:14:56 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@corte.si> | 2016-06-02 13:14:56 +1200 |
| commit | 07f7905f9182ad0098a5a2e37d40ce9b27298380 (patch) | |
| tree | 76ba04357353645f49e0f4bd8d835e471239b54b /pathod/log.py | |
| parent | eaa3b308f7bb48256ccf56ea07d008fa5f9dd6ad (diff) | |
| parent | 09da1febbd9beac5ef5650274899439f5ce10e98 (diff) | |
| download | mitmproxy-07f7905f9182ad0098a5a2e37d40ce9b27298380.tar.gz mitmproxy-07f7905f9182ad0098a5a2e37d40ce9b27298380.tar.bz2 mitmproxy-07f7905f9182ad0098a5a2e37d40ce9b27298380.zip | |
Merge pull request #1191 from cortesi/utils
Utils reorganisation
Diffstat (limited to 'pathod/log.py')
| -rw-r--r-- | pathod/log.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pathod/log.py b/pathod/log.py index 3f6aaea0..5bf55de4 100644 --- a/pathod/log.py +++ b/pathod/log.py @@ -2,9 +2,7 @@ import datetime import six -import netlib.utils -import netlib.tcp -import netlib.http +from netlib import strutils TIMEFMT = '%d-%m-%y %H:%M:%S' @@ -62,10 +60,10 @@ class LogCtx(object): def dump(self, data, hexdump): if hexdump: - for line in netlib.utils.hexdump(data): + for line in strutils.hexdump(data): self("\t%s %s %s" % line) else: - for i in netlib.utils.clean_bin(data).split("\n"): + for i in strutils.clean_bin(data).split("\n"): self("\t%s" % i) def __call__(self, line): |