open.source/magic-wormhole
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cosmetic cleanups to error messages

Browse Source
This commit is contained in:
Brian Warner 2016-04-25 18:24:39 -07:00
parent 2a6767ee6f
commit c017de5e4b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/wormhole/cli/cmd_receive.py
View File

@ -117,7 +117,7 @@ class TwistedReceiver:
them_bytes = yield w.get_data() them_bytes = yield w.get_data()
them_d = json.loads(them_bytes.decode("utf-8")) them_d = json.loads(them_bytes.decode("utf-8"))
if "error" in them_d: if "error" in them_d:
raise TransferError(u"ERROR: " + them_d["error"]) raise TransferError(them_d["error"])
returnValue(them_d) returnValue(them_d)
@inlineCallbacks @inlineCallbacks

6
src/wormhole/cli/cmd_send.py
View File

@ -91,10 +91,10 @@ def _send(reactor, w, args, phase1, fd_to_send, tor_manager):
if ok.lower() == "yes": if ok.lower() == "yes":
break break
if ok.lower() == "no": if ok.lower() == "no":
reject_data = json.dumps({"error": "verification rejected", err = "sender rejected verification check, abandoned transfer"
}).encode("utf-8") reject_data = json.dumps({"error": err}).encode("utf-8")
yield w.send_data(reject_data) yield w.send_data(reject_data)
raise TransferError("verification rejected, abandoning transfer") raise TransferError(err)
if fd_to_send is not None: if fd_to_send is not None:
transit_key = w.derive_key(APPID+"/transit-key") transit_key = w.derive_key(APPID+"/transit-key")
transit_sender.set_transit_key(transit_key) transit_sender.set_transit_key(transit_key)