mirror of
https://github.com/borgbackup/borg.git
synced 2024-12-25 17:27:31 +00:00
keymanager: don't depend on optional readline module
This commit is contained in:
parent
f7ed5d7220
commit
b8793d9577
1 changed files with 9 additions and 6 deletions
|
@ -142,8 +142,11 @@ def import_keyfile(self, args):
|
|||
self.store_keyblob(args)
|
||||
|
||||
def import_paperkey(self, args):
|
||||
# imported here because it has global side effects
|
||||
import readline
|
||||
try:
|
||||
# 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]
|
||||
try:
|
||||
|
@ -151,8 +154,8 @@ def import_paperkey(self, args):
|
|||
# id line input
|
||||
while True:
|
||||
idline = input('id: ').replace(' ', '')
|
||||
if idline == "":
|
||||
if yes("Abort import? [yN]:"):
|
||||
if idline == '':
|
||||
if yes('Abort import? [yN]:'):
|
||||
raise EOFError()
|
||||
|
||||
try:
|
||||
|
@ -184,8 +187,8 @@ def import_paperkey(self, args):
|
|||
while True:
|
||||
inline = input('{0:2d}: '.format(idx))
|
||||
inline = inline.replace(' ', '')
|
||||
if inline == "":
|
||||
if yes("Abort import? [yN]:"):
|
||||
if inline == '':
|
||||
if yes('Abort import? [yN]:'):
|
||||
raise EOFError()
|
||||
try:
|
||||
(data, checksum) = inline.split('-')
|
||||
|
|
Loading…
Reference in a new issue