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

tolerate lack of readline at runtime

Browse Source 
'readline' is part of the python stdlib, so declaring a dependency on it
doesn't help. It doesn't exist on windows, and the pypi 'readline'
module doesn't work on windows. So instead, just attempt to import
readline, and if that fails, fall back to a non-completion flavor.
This commit is contained in:
Brian Warner 2016-02-27 14:16:58 -08:00
parent b7319f90c8
commit 14dcfeed73
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/wormhole/codes.py
View File

@ -17,9 +17,6 @@ def extract_channel_id(code):
channel_id = int(code.split("-")[0])
return channel_id
import readline
#import sys
class CodeInputter:
def __init__(self, initial_channelids, get_channel_ids, code_length):
self._initial_channelids = initial_channelids
@ -86,10 +83,14 @@ class CodeInputter:
def input_code_with_completion(prompt, initial_channelids, get_channel_ids,
code_length):
c = CodeInputter(initial_channelids, get_channel_ids, code_length)
readline.parse_and_bind("tab: complete")
readline.set_completer(c.wrap_completer)
readline.set_completer_delims("")
try:
import readline
c = CodeInputter(initial_channelids, get_channel_ids, code_length)
readline.parse_and_bind("tab: complete")
readline.set_completer(c.wrap_completer)
readline.set_completer_delims("")
except ImportError:
pass
code = six.moves.input(prompt)
# Code is str(bytes) on py2, and str(unicode) on py3. We want unicode.
if isinstance(code, bytes):