Merge pull request python-mode#1055 from python-mode/improve-user-raw-input

diraol · web-flow · commit 8b5407115e76 · 2019-12-14T13:45:29.000-03:00
Improve user_input's input/raw_input compatibility.
diff --git a/pymode/environment.py b/pymode/environment.py
@@ -84,24 +84,31 @@ def message(msg, history=False):
 
         return vim.command('call pymode#wide_message("%s")' % str(msg))
 
-    def user_input(self, msg, default=''):
+    def user_input(self, msg='', default=''):
         """Return user input or default.
 
         :return str:
 
         """
-        msg = '%s %s ' % (self.prefix, msg)
+        prompt = []
+        prompt.append(str(self.prefix.strip()))
+        prompt.append(str(msg).strip())
 
         if default != '':
-            msg += '[%s] ' % default
+            prompt.append('[%s]' % default)
+
+        prompt.append('> ')
+        prompt = ' '.join([s for s in prompt if s])
+
+        vim.command('echohl Debug')
 
         try:
-            vim.command('echohl Debug')
-            input_str = vim.eval('input("%s> ")' % msg)
-            vim.command('echohl none')
+            input_str = vim.eval('input(%r)' % (prompt,))
         except KeyboardInterrupt:
             input_str = ''
 
+        vim.command('echohl none')
+
         return input_str or default
 
     def user_confirm(self, msg, yes=False):
