diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-05-01 17:25:00 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-05-01 17:25:00 +0200 |
| commit | c780fc7bdf818ce1a445b526ff3e5afc6c05807f (patch) | |
| tree | 646f9051b3f89204af3c03edcf51ad4e7711acc0 /libmproxy/utils.py | |
| parent | 3f5ca10c39a9f7d55e0f6943caf8f6ff762a0222 (diff) | |
| parent | 1c26516b1822d82e3b701539591a1d22831e0a19 (diff) | |
| download | mitmproxy-c780fc7bdf818ce1a445b526ff3e5afc6c05807f.tar.gz mitmproxy-c780fc7bdf818ce1a445b526ff3e5afc6c05807f.tar.bz2 mitmproxy-c780fc7bdf818ce1a445b526ff3e5afc6c05807f.zip | |
Merge branch 'master' of github.com:mitmproxy/mitmproxy
Diffstat (limited to 'libmproxy/utils.py')
| -rw-r--r-- | libmproxy/utils.py | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/libmproxy/utils.py b/libmproxy/utils.py index 02e8403b..7d0e369b 100644 --- a/libmproxy/utils.py +++ b/libmproxy/utils.py @@ -96,20 +96,6 @@ def multipartdecode(hdrs, content): return r return [] -def pretty_size(size): - suffixes = [ - ("B", 2**10), - ("kB", 2**20), - ("MB", 2**30), - ] - for suf, lim in suffixes: - if size >= lim: - continue - else: - x = round(size/float(lim/2**10), 2) - if x == int(x): - x = int(x) - return str(x) + suf def pretty_duration(secs): formatters = [ @@ -124,6 +110,7 @@ def pretty_duration(secs): #less than 1 sec return "{:.0f}ms".format(secs*1000) + class Data: def __init__(self, name): m = __import__(name) |