FakeStdin works, includes curtsies version bump

thomasballinger · thomasballinger · commit 281eb056aff6 · 2014-07-27T21:58:21.000-04:00
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -57,6 +57,7 @@ def __init__(self, coderunner, repl):
 
     def process_event(self, e):
         assert self.has_focus
+        logger.debug('fake input processing event %r', e)
         if isinstance(e, events.PasteEvent):
             for ee in e.events:
                 if ee not in rl_char_sequences:
@@ -71,13 +72,22 @@ def process_event(self, e):
             self.repl.run_code_and_maybe_finish()
         elif e in ["<ESC>"]:
             pass
+        elif e in ['<Ctrl-d>']:
+            if self.current_line == '':
+                self.repl.send_to_stdin('\n')
+                self.has_focus = False
+                self.current_line = ''
+                self.cursor_offset = 0
+                self.repl.run_code_and_maybe_finish(for_code='')
+            else:
+                pass
         elif e in ["\n", "\r", "<Ctrl-j>", "<Ctrl-m>"]:
             line = self.current_line
             self.repl.send_to_stdin(line + '\n')
             self.has_focus = False
             self.current_line = ''
             self.cursor_offset = 0
-            self.repl.run_code_and_maybe_finish(for_code=line)
+            self.repl.run_code_and_maybe_finish(for_code=line+'\n')
         else: # add normal character
             self.add_input_character(e)
 
@@ -406,7 +416,6 @@ def process_event(self, e):
                 raise SystemExit()
         elif e in ("\n", "\r", "<PADENTER>", "<Ctrl-j>", "<Ctrl-m>"):
             self.on_enter()
-            self.update_completion()
         elif e == '<TAB>': # tab
             self.on_tab()
             self.rl_history.reset()
diff --git a/setup.py b/setup.py
@@ -151,7 +151,7 @@ def initialize_options(self):
 
 if sys.version_info[:2] >= (2, 6):
     # curtsies only supports 2.6 and onwards
-    extras_require['curtsies'] = ['curtsies >=0.1.5, <0.2.0', 'greenlet']
+    extras_require['curtsies'] = ['curtsies >=0.1.6, <0.2.0', 'greenlet']
     packages.append("bpython.curtsiesfrontend")
     entry_points['console_scripts'].append(
         'bpython-curtsies = bpython.curtsies:main [curtsies]')
