mirror
/
borg
mirror of https://github.com/borgbackup/borg.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #2983 from enkore/issue/2976-1.1 

1.1 backport #2980 keymanager: don't depend on optional readline module
This commit is contained in:
TW 2017-08-30 23:54:48 +02:00 committed by GitHub
parent 191151e2b9 35c8975a5c
commit 6d0b4c3e09
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/borg/crypto/keymanager.py
View File

@ -142,8 +142,11 @@ class KeyManager:
self.store_keyblob(args) self.store_keyblob(args)
def import_paperkey(self, args): def import_paperkey(self, args):
# imported here because it has global side effects try:
import readline # imported here because it has global side effects
import readline
except ImportError:
print('Note: No line editing available due to missing readline support')
repoid = bin_to_hex(self.repository.id)[:18] repoid = bin_to_hex(self.repository.id)[:18]
try: try:
@ -151,8 +154,8 @@ class KeyManager:
# id line input # id line input
while True: while True:
idline = input('id: ').replace(' ', '') idline = input('id: ').replace(' ', '')
if idline == "": if idline == '':
if yes("Abort import? [yN]:"): if yes('Abort import? [yN]:'):
raise EOFError() raise EOFError()
try: try:
@ -184,8 +187,8 @@ class KeyManager:
while True: while True:
inline = input('{0:2d}: '.format(idx)) inline = input('{0:2d}: '.format(idx))
inline = inline.replace(' ', '') inline = inline.replace(' ', '')
if inline == "": if inline == '':
if yes("Abort import? [yN]:"): if yes('Abort import? [yN]:'):
raise EOFError() raise EOFError()
try: try:
(data, checksum) = inline.split('-') (data, checksum) = inline.split('-')