Browse Source

line_input(): fix regression

The MMGen Project 2 years ago
parent
commit
d5e65cfdcf
3 changed files with 4 additions and 5 deletions
  1. 1 1
      mmgen/data/version
  2. 1 1
      mmgen/ui.py
  3. 2 3
      test/test_py_d/ts_ethdev.py

+ 1 - 1
mmgen/data/version

@@ -1 +1 @@
-13.3.dev9
+13.3.dev10

+ 1 - 1
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):
 

+ 2 - 3
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):