# Plus coverage of test_warning. Was 20% with test_openshell.
from idlelib import pyshell
+import os
import unittest
from test.support import requires
from tkinter import Tk
self.assertEqual(pyshell.restart_line(width, ''), expect)
self.assertEqual(pyshell.restart_line(taglen+2, ''), expect+' =')
+ def test_fix_user_path(self):
+ # gh-134300: the idlelib directory is removed, other entries kept.
+ eq = self.assertEqual
+ idlelib_dir = os.path.dirname(os.path.abspath(pyshell.__file__))
+ eq(pyshell.fix_user_path(['', '/a', idlelib_dir, '/b']), ['', '/a', '/b'])
+ eq(pyshell.fix_user_path(['/a', '/b']), ['/a', '/b'])
+ eq(pyshell.fix_user_path([idlelib_dir]), [])
+
class PyShellFileListTest(unittest.TestCase):
return tag[:-2] # Remove ' ='.
+def fix_user_path(path):
+ """Return path without the idlelib directory (gh-134300).
+
+ That directory is on sys.path when idle.py is run as a script.
+ Otherwise user code could import idlelib submodules as top-level
+ modules, such as "import help".
+ """
+ idlelib_dir = os.path.dirname(os.path.abspath(__file__))
+ return [p for p in path if p != idlelib_dir]
+
+
class ModifiedInterpreter(InteractiveInterpreter):
def __init__(self, tkconsole):
path.extend(sys.path)
else:
path = sys.path
+ path = fix_user_path(path) # gh-134300
self.runcommand("""if 1:
import sys as _sys
--- /dev/null
+Do not add the ``idlelib`` directory to the path of the IDLE user process.
+User code run in IDLE can no longer import ``idlelib`` submodules as
+top-level modules, such as ``import help``.