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

_rlcompleter: improve debug messages and comments

Browse Source
This commit is contained in:
Brian Warner 2017-04-05 13:35:27 -07:00
parent 7699ed2291
commit 4c7b908024
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/wormhole/_rlcompleter.py
View File

@ -1,5 +1,5 @@
from __future__ import print_function, unicode_literals from __future__ import print_function, unicode_literals
import traceback import os, traceback
from sys import stderr from sys import stderr
try: try:
import readline import readline
@ -10,16 +10,13 @@ from attr import attrs, attrib
from twisted.internet.defer import inlineCallbacks, returnValue from twisted.internet.defer import inlineCallbacks, returnValue
from twisted.internet.threads import deferToThread, blockingCallFromThread from twisted.internet.threads import deferToThread, blockingCallFromThread
#import os errf = None
#errf = None if 0:
#if os.path.exists("err"): errf = open("err", "w") if os.path.exists("err") else None
# errf = open("err", "w")
def debug(*args, **kwargs): def debug(*args, **kwargs):
# if errf: if errf:
# kwargs["file"] = errf print(*args, file=errf, **kwargs)
# print(*args, **kwargs) errf.flush()
# errf.flush()
pass
@attrs @attrs
class CodeInputter(object): class CodeInputter(object):
@ -72,7 +69,10 @@ class CodeInputter(object):
# 'text' is one of these categories: # 'text' is one of these categories:
# "": complete on nameplates # "": complete on nameplates
# "12": complete on nameplates # "12" (multiple matches): complete on nameplates
# "123" (single match): return "123-" (no commit, no refresh)
# nope: need to let readline add letters
# so: return "123-"
# "123-": commit to nameplate (if not already), complete on words # "123-": commit to nameplate (if not already), complete on words
if self._committed_nameplate: if self._committed_nameplate:
@ -82,14 +82,14 @@ class CodeInputter(object):
# gentler way to encourage them to not do that. # gentler way to encourage them to not do that.
raise ValueError("nameplate (NN-) already entered, cannot go back") raise ValueError("nameplate (NN-) already entered, cannot go back")
if not got_nameplate: if not got_nameplate:
# we're completing on nameplates # we're completing on nameplates: "" or "12" or "123"
self.bcft(ih.refresh_nameplates) # results arrive later self.bcft(ih.refresh_nameplates) # results arrive later
debug(" getting nameplates") debug(" getting nameplates")
completions = self.bcft(ih.get_nameplate_completions, nameplate) completions = self.bcft(ih.get_nameplate_completions, nameplate)
else: else: # "123-"
# time to commit to this nameplate, if they haven't already # time to commit to this nameplate, if they haven't already
if not self._committed_nameplate: if not self._committed_nameplate:
debug(" chose_nameplate", nameplate) debug(" choose_nameplate(%s)" % nameplate)
self.bcft(ih.choose_nameplate, nameplate) self.bcft(ih.choose_nameplate, nameplate)
self._committed_nameplate = nameplate self._committed_nameplate = nameplate
# and we're completing on words now # and we're completing on words now
@ -111,7 +111,9 @@ class CodeInputter(object):
# gentler way to encourage them to not do that. # gentler way to encourage them to not do that.
raise ValueError("nameplate (NN-) already entered, cannot go back") raise ValueError("nameplate (NN-) already entered, cannot go back")
else: else:
debug(" choose_nameplate(%s)" % nameplate)
self._input_helper.choose_nameplate(nameplate) self._input_helper.choose_nameplate(nameplate)
debug(" choose_words(%s)" % words)
self._input_helper.choose_words(words) self._input_helper.choose_words(words)
def _input_code_with_completion(prompt, input_helper, reactor): def _input_code_with_completion(prompt, input_helper, reactor):