aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-03-25 12:47:13 +0100
committerMaximilian Hils <git@maximilianhils.com>2015-03-25 12:47:13 +0100
commitb0f60cf1f293a19c7f87782a3ad762b77cb2a5a7 (patch)
tree3f52beb383ce26edd612205e4775efa1a3068977
parent2acd77dea025b489d5d0ca19fc1c84901ac335d4 (diff)
parentf45ac12d203a9ace1879ed5fa164f2890f9ce207 (diff)
downloadmitmproxy-b0f60cf1f293a19c7f87782a3ad762b77cb2a5a7.tar.gz
mitmproxy-b0f60cf1f293a19c7f87782a3ad762b77cb2a5a7.tar.bz2
mitmproxy-b0f60cf1f293a19c7f87782a3ad762b77cb2a5a7.zip
Merge pull request #532 from tekii/master
handles UnicodeDecodeError (#531)
-rw-r--r--libmproxy/console/common.py2
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)