Minor adjustments

Author: StanFromIreland

Lib/sqlite3/__main__.py

@@ -15,7 +15,11 @@
 from ._completer import completer
 
 
-EOF_KEY = "CTRL-Z" if sys.platform == "win32" else "CTRL-D"
+# IDLE uses CTRL-D for EOF on all platforms (gh-102628).
+if sys.platform == "win32" and "idlelib.run" not in sys.modules:
+    EOF_KEY = "CTRL-Z"
+else:
+    EOF_KEY = "CTRL-D"
 
 
 def execute(c, sql, suppress_errors=True, theme=theme_no_color):

Lib/test/test_sqlite3/test_cli.py

@@ -82,6 +82,7 @@ class InteractiveSession(unittest.TestCase):
     MEMORY_DB_MSG = "Connected to a transient in-memory database"
     PS1 = "sqlite> "
     PS2 = "... "
+    EOF_KEY = "CTRL-Z" if sys.platform == "win32" else "CTRL-D"
 
     def run_cli(self, *args, commands=()):
         with (
@@ -104,35 +105,15 @@ def run_cli(self, *args, commands=()):
     def test_interact(self):
         out, err = self.run_cli()
         self.assertIn(self.MEMORY_DB_MSG, err)
-        self.assertIn(self.MEMORY_DB_MSG, err)
+        self.assertIn(f'type ".quit" or {self.EOF_KEY} to quit', err)
         self.assertEndsWith(out, self.PS1)
         self.assertEqual(out.count(self.PS1), 1)
         self.assertEqual(out.count(self.PS2), 0)
 
-    @unittest.skipUnless(sys.platform == "win32", "Windows EOF is CTRL-Z")
-    def test_interact_banner_win(self):
-        _, err = self.run_cli()
-        self.assertIn('type ".quit" or CTRL-Z to quit', err)
-
-    @unittest.skipUnless(sys.platform != "win32", "Non-Windows EOF is CTRL-D")
-    def test_interact_banner_non_win(self):
-        _, err = self.run_cli()
-        self.assertIn('type ".quit" or CTRL-D to quit', err)
-
-    @unittest.skipUnless(sys.platform == "win32", "Windows EOF is CTRL-Z")
-    def test_interact_help_eof_win(self):
-        out, err = self.run_cli(commands=(".help",))
-        self.assertIn(self.MEMORY_DB_MSG, err)
-        self.assertIn("Exit the CLI, equivalent to CTRL-Z", out)
-        self.assertEndsWith(out, self.PS1)
-        self.assertEqual(out.count(self.PS1), 2)
-        self.assertEqual(out.count(self.PS2), 0)
-
-    @unittest.skipUnless(sys.platform != "win32", "Non-Windows EOF is CTRL-D")
-    def test_interact_help_eof_non_win(self):
+    def test_interact_help(self):
         out, err = self.run_cli(commands=(".help",))
         self.assertIn(self.MEMORY_DB_MSG, err)
-        self.assertIn("Exit the CLI, equivalent to CTRL-D", out)
+        self.assertIn(f"Exit the CLI, equivalent to {self.EOF_KEY}", out)
         self.assertEndsWith(out, self.PS1)
         self.assertEqual(out.count(self.PS1), 2)
         self.assertEqual(out.count(self.PS2), 0)