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

allow WelcomeError to interrupt input_code()

Browse Source
This commit is contained in:
Brian Warner 2016-05-26 15:38:19 -07:00
parent 905ec05696
commit 7acb68d2ee
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/wormhole/wormhole.py
View File

@ -228,6 +228,7 @@ class _Wormhole:
self._started_get_code = False self._started_get_code = False
self._get_code = None self._get_code = None
self._started_input_code = False self._started_input_code = False
self._input_code_waiter = None
self._code = None self._code = None
self._nameplate_id = None self._nameplate_id = None
self._nameplate_state = CLOSED self._nameplate_state = CLOSED
@ -450,8 +451,11 @@ class _Wormhole:
ic = _InputCode(self._reactor, prompt, code_length, ic = _InputCode(self._reactor, prompt, code_length,
self._ws_send_command, self._timing) self._ws_send_command, self._timing)
self._response_handle_nameplates = ic._response_handle_nameplates self._response_handle_nameplates = ic._response_handle_nameplates
# TODO: signal_error # we reveal the Deferred we're waiting on, so _signal_error can
code = yield ic.go() # wake us up if something goes wrong (like a welcome error)
self._input_code_waiter = ic.go()
code = yield self._input_code_waiter
self._input_code_waiter = None
self._event_learned_code(code) self._event_learned_code(code)
returnValue(None) returnValue(None)
@ -800,6 +804,8 @@ class _Wormhole:
# now errback all API deferreds except close(): get_code, # now errback all API deferreds except close(): get_code,
# input_code, verify, get # input_code, verify, get
if self._input_code_waiter and not self._input_code_waiter.called:
self._input_code_waiter.errback(error)
for d in self._connection_waiters: # input_code, get_code (early) for d in self._connection_waiters: # input_code, get_code (early)
if self.DEBUG: print("EB cw") if self.DEBUG: print("EB cw")
d.errback(error) d.errback(error)