paste events work in stdin and save dialogs

thomasballinger · thomasballinger · commit b6230d9a26de · 2014-02-15T21:53:32.000-05:00
diff --git a/bpython/curtsiesfrontend/interaction.py b/bpython/curtsiesfrontend/interaction.py
@@ -52,6 +52,9 @@ def process_event(self, e):
         if isinstance(e, events.RefreshRequestEvent):
             self.waiting_for_refresh = False
             self.request_greenlet.switch()
+        elif isinstance(e, events.PasteEvent):
+            for ee in e.events:
+                self.add_normal_character(ee if len(ee) == 1 else ee[-1]) #strip control seq
         elif e in rl_char_sequences:
             self.cursor_offset_in_line, self._current_line = rl_char_sequences[e](self.cursor_offset_in_line, self._current_line)
         elif e == "":
@@ -72,10 +75,13 @@ def process_event(self, e):
             self.request_greenlet.switch(False)
             self.escape()
         else: # add normal character
-            self._current_line = (self._current_line[:self.cursor_offset_in_line] +
-                                 e +
-                                 self._current_line[self.cursor_offset_in_line:])
-            self.cursor_offset_in_line += 1
+            self.add_normal_character(e)
+
+    def add_normal_character(self, e):
+        self._current_line = (self._current_line[:self.cursor_offset_in_line] +
+                             e +
+                             self._current_line[self.cursor_offset_in_line:])
+        self.cursor_offset_in_line += 1
 
     def escape(self):
         """unfocus from statusbar, clear prompt state, wait for notify call"""
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -55,7 +55,10 @@ def __init__(self, coderunner, repl):
 
     def process_event(self, e):
         assert self.has_focus
-        if e in rl_char_sequences:
+        if isinstance(e, events.PasteEvent):
+            for ee in e.events:
+                self.add_normal_character(ee if len(ee) == 1 else ee[-1]) #strip control seq
+        elif e in rl_char_sequences:
             self.cursor_offset_in_line, self.current_line = rl_char_sequences[e](self.cursor_offset_in_line, self.current_line)
         elif isinstance(e, events.SigIntEvent):
             self.coderunner.sigint_happened = True
@@ -64,12 +67,7 @@ def process_event(self, e):
             self.cursor_offset_in_line = 0
             self.repl.run_code_and_maybe_finish()
         else: # add normal character
-            logging.debug('adding normal char %r to current line', e)
-            c = e if py3 else e.encode('utf8')
-            self.current_line = (self.current_line[:self.cursor_offset_in_line] +
-                                 c +
-                                 self.current_line[self.cursor_offset_in_line:])
-            self.cursor_offset_in_line += 1
+            self.add_normal_character(e)
 
         if self.current_line.endswith(("\n", "\r")):
             line = self.current_line
@@ -82,6 +80,14 @@ def process_event(self, e):
         else:
             self.repl.send_to_stdin(self.current_line)
 
+    def add_normal_character(self, e):
+        logging.debug('adding normal char %r to current line', e)
+        c = e if py3 else e.encode('utf8')
+        self.current_line = (self.current_line[:self.cursor_offset_in_line] +
+                             c +
+                             self.current_line[self.cursor_offset_in_line:])
+        self.cursor_offset_in_line += 1
+
     def readline(self):
         self.has_focus = True
         self.repl.send_to_stdin(self.current_line)
