Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-12-02 12:01:17 +00:00
Code Issues Projects Releases Wiki Activity

fix #607 decode data before sending it to pyperclip

Browse Source
This commit is contained in:
Marcelo Glezer 2015-06-05 15:19:57 -03:00
parent 783e904b92
commit 17b34de28d
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libmproxy/console/common.py
View File

@ -284,8 +284,15 @@ 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
# this is because pyperclip does an encode('utf-8') without checking if data is already encoded or not
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":