aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2016-04-09 14:35:37 -0700
committerMaximilian Hils <git@maximilianhils.com>2016-04-09 14:35:37 -0700
commit4d16bb8cb6963b866937a566bdbd40a85cd6c53f (patch)
tree7ee07ab0f8ed5d32b80a06aebbd419fa3d574256
parent5c333ee3bad47e2e5bb7bf75d839e0227414301c (diff)
parent43063048276c6fe5a5026871167238442f9075cc (diff)
downloadmitmproxy-4d16bb8cb6963b866937a566bdbd40a85cd6c53f.tar.gz
mitmproxy-4d16bb8cb6963b866937a566bdbd40a85cd6c53f.tar.bz2
mitmproxy-4d16bb8cb6963b866937a566bdbd40a85cd6c53f.zip
Merge branch 'master' of https://github.com/mitmproxy/mitmproxy
-rw-r--r--mitmproxy/console/common.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mitmproxy/console/common.py b/mitmproxy/console/common.py
index 141735ef..4e472fb6 100644
--- a/mitmproxy/console/common.py
+++ b/mitmproxy/console/common.py
@@ -303,7 +303,7 @@ def copy_to_clipboard_or_prompt(data):
try:
pyperclip.copy(toclip)
- except (RuntimeError, UnicodeDecodeError, AttributeError):
+ except (RuntimeError, UnicodeDecodeError, AttributeError, TypeError):
def save(k):
if k == "y":
ask_save_path("Save data", data)