Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-23 08:11:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #610 from tekii/fix-607

Browse Source 
Fix 607
This commit is contained in:
Aldo Cortesi 2015-06-06 11:10:33 +12:00
commit bf7b76a997
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libmproxy/console/common.py
View File

@ -284,8 +284,16 @@ def copy_flow(part, scope, flow, master, state):
signals.status_message.send(message="No contents to copy.") signals.status_message.send(message="No contents to copy.")
return 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: try:
pyperclip.copy(data) toclip = data.decode('utf-8')
except (UnicodeDecodeError):
toclip = data
try:
pyperclip.copy(toclip)
except (RuntimeError, UnicodeDecodeError, AttributeError): except (RuntimeError, UnicodeDecodeError, AttributeError):
def save(k): def save(k):
if k == "y": if k == "y":