diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2015-06-06 11:10:33 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2015-06-06 11:10:33 +1200 |
| commit | bf7b76a997ab4183fb6722de9a50dd396f857809 (patch) | |
| tree | bffeb01d52777ff2bc7e2520d967e944726b9dc1 | |
| parent | 783e904b924d7f8d4448512b03383d429f5cf7de (diff) | |
| parent | 1befa9477c0494fe4400dc62ee0c0907c32d46bd (diff) | |
| download | mitmproxy-bf7b76a997ab4183fb6722de9a50dd396f857809.tar.gz mitmproxy-bf7b76a997ab4183fb6722de9a50dd396f857809.tar.bz2 mitmproxy-bf7b76a997ab4183fb6722de9a50dd396f857809.zip | |
Merge pull request #610 from tekii/fix-607
Fix 607
| -rw-r--r-- | libmproxy/console/common.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/libmproxy/console/common.py b/libmproxy/console/common.py index 57d4c994..e5bebf7f 100644 --- a/libmproxy/console/common.py +++ b/libmproxy/console/common.py @@ -284,8 +284,16 @@ def copy_flow(part, scope, flow, master, state): signals.status_message.send(message="No contents to copy.") return + # pyperclip calls encode('utf-8') on data to be copied without checking. + # if data are already encoded that way UnicodeDecodeError is thrown. + toclip = "" try: - pyperclip.copy(data) + toclip = data.decode('utf-8') + except (UnicodeDecodeError): + toclip = data + + try: + pyperclip.copy(toclip) except (RuntimeError, UnicodeDecodeError, AttributeError): def save(k): if k == "y": |