reconfigure and rename formatforfile

rybarczykj · thomasballinger · commit 214e4ca63a96 · 2020-07-21T19:59:01.000-07:00
- New name: get_session_formatted_for_file
- No longer takes parameters as it can refer directly to all_logical_lines
- send_session_to_external_editor now call this method instead of
doing a very similar process
- Now "# OUT:" refers to output and "### " refers to current line
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -20,7 +20,6 @@
 from pygments.formatters import TerminalFormatter
 
 from wcwidth import wcswidth
-from math import ceil
 
 import blessings
 
@@ -1009,18 +1008,10 @@ def send_current_block_to_external_editor(self, filename=None):
 
     def send_session_to_external_editor(self, filename=None):
         """
-        Sends entire bpython session to external editor to be edited. Usually bound to F7. 
-
-        Loops through self.all_logical_lines so that lines aren't wrapped in the editor.
-        
+        Sends entire bpython session to external editor to be edited. Usually bound to F7.         
         """
         for_editor = EDIT_SESSION_HEADER
-        for_editor += "\n".join(
-            line[0] if line[1] == INPUT
-            else "### " + line[0] 
-            for line in self.all_logical_lines
-        )
-        for_editor += "\n" + "### " + self.current_line
+        for_editor += self.get_session_formatted_for_file()
 
         text = self.send_to_external_editor(for_editor)
         if text == for_editor:
@@ -1035,7 +1026,7 @@ def send_session_to_external_editor(self, filename=None):
             current_line = lines[-1][4:]
         else:
             current_line = ""
-        from_editor = [line for line in lines if line[:3] != "###"]
+        from_editor = [line for line in lines if line[:6] != "# OUT:"]
         if all(not line.strip() for line in from_editor):
             self.status_bar.message(
                 _("Session not reevaluated because saved file was blank")
@@ -1938,7 +1929,7 @@ def initialize_interp(self):
 
     def getstdout(self):
         """
-        Returns a string of the current bpython session, formatted and wrapped.
+        Returns a string of the current bpython session, wrapped, WITH prompts.
         """
         lines = self.lines_for_display + [self.current_line_formatted]
         s = (
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -821,18 +821,18 @@ def line_is_empty(line):
             indentation = 0
         return indentation
 
-    def formatforfile(self, session_ouput):
+    def get_session_formatted_for_file(self):
         """Format the stdout buffer to something suitable for writing to disk,
         i.e. without >>> and ... at input lines and with "# OUT: " prepended to
-        output lines."""
+        output lines and "### " prepended to current line"""
 
         def process():
             for line, lineType in self.all_logical_lines:
                 if lineType == LineTypeTranslator.INPUT:
                     yield line
                 elif line.rstrip():
-                    yield "# OUT: %s" % (line,)
-
+                    yield "# OUT: %s" % line
+            yield "###: %s" % self.current_line
         return "\n".join(process())
 
     def write2file(self):
@@ -872,7 +872,7 @@ def write2file(self):
                 self.interact.notify(_("Save cancelled."))
                 return
 
-        stdout_text = self.formatforfile(self.getstdout())
+        stdout_text = self.get_session_formatted_for_file()
 
         try:
             with open(fn, mode) as f:
@@ -889,7 +889,7 @@ def copy2clipboard(self):
             self.interact.notify(_("No clipboard available."))
             return
 
-        content = self.formatforfile(self.getstdout())
+        content = self.get_session_formatted_for_file()
         try:
             self.clipboard.copy(content)
         except CopyFailed:
