Use __main__ for __name__ to match python behavior.

thomasballinger · thomasballinger · commit 5f79f05b9ef5 · 2021-09-27T08:51:47.000-07:00
diff --git a/bpython/args.py b/bpython/args.py
@@ -223,9 +223,9 @@ def exec_code(interpreter, args):
         source = sourcefile.read()
     old_argv, sys.argv = sys.argv, args
     sys.path.insert(0, os.path.abspath(os.path.dirname(args[0])))
-    spec = importlib.util.spec_from_loader("__console__", loader=None)
+    spec = importlib.util.spec_from_loader("__main__", loader=None)
     mod = importlib.util.module_from_spec(spec)
-    sys.modules["__console__"] = mod
+    sys.modules["__main__"] = mod
     interpreter.locals.update(mod.__dict__)
     interpreter.locals["__file__"] = args[0]
     interpreter.runsource(source, args[0], "exec")
diff --git a/bpython/test/test_args.py b/bpython/test/test_args.py
@@ -80,6 +80,41 @@ def test_exec_dunder_file(self):
             )
             self.assertEqual(stderr.strip(), f.name)
 
+    def test_exec_dunder_name(self):
+        with tempfile.NamedTemporaryFile(mode="w") as f:
+            f.write(
+                dedent(
+                    """\
+                import sys
+                sys.stderr.write(__name__)
+                sys.stderr.flush()"""
+                )
+            )
+            f.flush()
+            _, stderr = run_with_tty(
+                [sys.executable] + ["-m", "bpython.curtsies", f.name]
+            )
+            self.assertEqual(stderr.strip(), '__main__')
+
+    def test_exec_dunder_name_in_imported_module(self):
+        with tempfile.NamedTemporaryFile(mode="w", suffix=".py") as module_file, tempfile.NamedTemporaryFile(mode="w") as main_file:
+            module_file.write(
+                dedent(
+                    """\
+                import sys
+                sys.stderr.write(__name__)
+                sys.stderr.flush()"""
+                )
+            )
+            module_file.flush()
+            module_name = os.path.basename(module_file.name)[:-3]
+            main_file.write(f"import {module_name}")
+            main_file.flush()
+            _, stderr = run_with_tty(
+                [sys.executable] + ["-m", "bpython.curtsies", main_file.name]
+            )
+            self.assertEqual(stderr.strip(), module_name)
+
     def test_exec_nonascii_file(self):
         with tempfile.NamedTemporaryFile(mode="w") as f:
             f.write(
