diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2013-09-14 23:47:04 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2013-09-14 23:47:04 +0200 |
| commit | 2956c144d30558141ec43bec798a424974ffa6f1 (patch) | |
| tree | 297a3a9de73f66f5ad0224e60d7ae7520048d282 /libmproxy/utils.py | |
| parent | 729677cd85cffedec8f481f1b6025f00fb637e13 (diff) | |
| parent | 38a1135ab8f3ab2e97d07fa8e339067c67722e16 (diff) | |
| download | mitmproxy-2956c144d30558141ec43bec798a424974ffa6f1.tar.gz mitmproxy-2956c144d30558141ec43bec798a424974ffa6f1.tar.bz2 mitmproxy-2956c144d30558141ec43bec798a424974ffa6f1.zip | |
Merge branch 'master' into 0.10
Diffstat (limited to 'libmproxy/utils.py')
| -rw-r--r-- | libmproxy/utils.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmproxy/utils.py b/libmproxy/utils.py index 258626db..961c6618 100644 --- a/libmproxy/utils.py +++ b/libmproxy/utils.py @@ -74,7 +74,7 @@ def pretty_size(size): suffixes = [ ("B", 2**10), ("kB", 2**20), - ("M", 2**30), + ("MB", 2**30), ] for suf, lim in suffixes: if size >= lim: |