diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-05-31 01:51:31 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-05-31 01:51:31 +0200 |
| commit | ec92fca8c030fe5971a034a658033f70965b990a (patch) | |
| tree | ef9a2049eeab539d13e1f9662fd51220ab4ee817 /libmproxy/console/common.py | |
| parent | 0f8e8ee1ad667c8d747d5876f9b630ecbc01d7e9 (diff) | |
| parent | a05a70d8168a07c92b2a3ecbbb1958d85532efe3 (diff) | |
| download | mitmproxy-ec92fca8c030fe5971a034a658033f70965b990a.tar.gz mitmproxy-ec92fca8c030fe5971a034a658033f70965b990a.tar.bz2 mitmproxy-ec92fca8c030fe5971a034a658033f70965b990a.zip | |
Merge branch 'master' of github.com:mitmproxy/mitmproxy
Diffstat (limited to 'libmproxy/console/common.py')
| -rw-r--r-- | libmproxy/console/common.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libmproxy/console/common.py b/libmproxy/console/common.py index b920a11f..3180170d 100644 --- a/libmproxy/console/common.py +++ b/libmproxy/console/common.py @@ -164,7 +164,7 @@ def raw_format_flow(f, focus, extended, padding): 4: "code_400", 5: "code_500", } - ccol = codes.get(f["resp_code"]/100, "code_other") + ccol = codes.get(f["resp_code"] / 100, "code_other") resp.append(fcol(SYMBOL_RETURN, ccol)) if f["resp_is_replay"]: resp.append(fcol(SYMBOL_REPLAY, "replay")) @@ -200,7 +200,7 @@ def save_data(path, data, master, state): try: with file(path, "wb") as f: f.write(data) - except IOError, v: + except IOError as v: signals.status_message.send(message=v.strerror) @@ -214,7 +214,7 @@ def ask_save_overwite(path, data, master, state): save_data(path, data, master, state) signals.status_prompt_onekey.send( - prompt = "'"+path+"' already exists. Overwite?", + prompt = "'" + path + "' already exists. Overwite?", keys = ( ("yes", "y"), ("no", "n"), |