Merge https://github.com/bpython/bpython into static

rybarczykj · rybarczykj · commit 9f29073ae85f · 2020-08-03T10:36:51.000-05:00
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -287,6 +287,18 @@ def find_distributions(self, context):
 
         return None
 
+    def find_spec(self, fullname, path, target=None):
+        for finder in self.old_meta_path:
+            # Consider the finder only if it implements find_spec
+            if not getattr(finder, "find_spec", None):
+                continue
+            # Attempt to find the spec
+            spec = finder.find_spec(fullname, path, target)
+            if spec is not None:
+                # Patch the loader to enable reloading
+                spec.__loader__ = ImportLoader(self.watcher, spec.__loader__)
+                return spec
+
     def find_module(self, fullname, path=None):
         for finder in self.old_meta_path:
             loader = finder.find_module(fullname, path)
@@ -1026,7 +1038,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[:6] != "# OUT:"]
+        from_editor = [line for line in lines if line[:6] != "# OUT:" and line[:3] != "###"]
         if all(not line.strip() for line in from_editor):
             self.status_bar.message(
                 _("Session not reevaluated because saved file was blank")
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -835,7 +835,7 @@ def process():
                     yield line
                 elif line.rstrip():
                     yield "# OUT: %s" % line
-            yield "###: %s" % self.current_line
+            yield "### %s" % self.current_line
 
         return "\n".join(process())
 
diff --git a/bpython/sample-config b/bpython/sample-config
@@ -36,6 +36,10 @@
 # color_scheme = default
 
 # External editor to use for editing the current line, block, or full history
+# Examples: vi (vim)
+#          code --wait (VS Code) - in VS Code use the command pallete to:
+#                Shell Command: Install 'code' command in PATH
+#          atom -nw (Atom)
 # Default is to try $EDITOR and $VISUAL, then vi - but if you uncomment
 # the line below that will take precedence
 # editor = vi
