diff options
author | Maximilian Hils <git@maximilianhils.com> | 2015-03-26 18:17:36 +0100 |
---|---|---|
committer | Maximilian Hils <git@maximilianhils.com> | 2015-03-26 18:17:36 +0100 |
commit | 04f2467e84905d44483469cf43ada4ec44faa203 (patch) | |
tree | 9076642f7439a877d1839293739b75d3c0f805c5 /libmproxy/console/common.py | |
parent | 9854379046a5464f4fd638785bafca87b91a495a (diff) | |
parent | 423530fc258ddd09642de401c4fd5cf71ed06be6 (diff) | |
download | mitmproxy-04f2467e84905d44483469cf43ada4ec44faa203.tar.gz mitmproxy-04f2467e84905d44483469cf43ada4ec44faa203.tar.bz2 mitmproxy-04f2467e84905d44483469cf43ada4ec44faa203.zip |
Merge branch 'master' of github.com:mitmproxy/mitmproxy
Diffstat (limited to 'libmproxy/console/common.py')
-rw-r--r-- | libmproxy/console/common.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmproxy/console/common.py b/libmproxy/console/common.py index 2f143f01..bc8a2aad 100644 --- a/libmproxy/console/common.py +++ b/libmproxy/console/common.py @@ -252,7 +252,7 @@ def copy_flow(part, scope, flow, master, state): try: master.add_event(str(len(data))) pyperclip.copy(data) - except RuntimeError: + except (RuntimeError, UnicodeDecodeError): def save(k): if k == "y": ask_save_path("Save data", data, master, state) |