From d5e65cfdcf97adde73b6428c6b61c076baa49055 Mon Sep 17 00:00:00 2001 From: The MMGen Project Date: Mon, 24 Oct 2022 20:46:47 +0000 Subject: [PATCH] line_input(): fix regression --- mmgen/data/version | 2 +- mmgen/ui.py | 2 +- test/test_py_d/ts_ethdev.py | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/mmgen/data/version b/mmgen/data/version index 07724dec..6374e737 100644 --- a/mmgen/data/version +++ b/mmgen/data/version @@ -1 +1 @@ -13.3.dev9 +13.3.dev10 diff --git a/mmgen/ui.py b/mmgen/ui.py index 8341d869..a55ce05a 100755 --- a/mmgen/ui.py +++ b/mmgen/ui.py @@ -86,7 +86,7 @@ def line_input(prompt,echo=True,insert_txt='',hold_protect=True): if hold_protect: kb_hold_protect() - return (insert_txt if insert_txt and not readline else '') + reply.strip() + return reply.strip() def keypress_confirm(prompt,default_yes=False,verbose=False,no_nl=False,complete_prompt=False): diff --git a/test/test_py_d/ts_ethdev.py b/test/test_py_d/ts_ethdev.py index ba873246..b10e8b56 100755 --- a/test/test_py_d/ts_ethdev.py +++ b/test/test_py_d/ts_ethdev.py @@ -1278,12 +1278,11 @@ class TestSuiteEthdev(TestSuiteBase,TestSuiteShared): def edit_label1(self): return self.edit_label(out_num=del_addrs[0],label_text=tw_label_zh[:3]) def edit_label2(self): - return self.edit_label(out_num=del_addrs[0],label_text=tw_label_zh[3:],changed=True) + idx = 3 if opt.pexpect_spawn else 0 + return self.edit_label(out_num=del_addrs[0],label_text=tw_label_zh[idx:],changed=True) def edit_label3(self): return self.edit_label(out_num=del_addrs[1],label_text=tw_label_lat_cyr_gr) def edit_label4(self): - if not opt.pexpect_spawn: - return 'skip' return self.edit_label(out_num=del_addrs[0],label_text=self.erase_input) def token_edit_label1(self):