Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions Lib/idlelib/idle_test/test_pyshell.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
# 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
Expand All @@ -28,6 +29,14 @@ def test_restart_line_narrow(self):
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):

Expand Down
12 changes: 12 additions & 0 deletions Lib/idlelib/pyshell.py
Original file line number Diff line number Diff line change
Expand Up @@ -408,6 +408,17 @@ def restart_line(width, filename): # See bpo-38141.
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):
Expand Down Expand Up @@ -569,6 +580,7 @@ def transfer_path(self, with_cwd=False):
path.extend(sys.path)
else:
path = sys.path
path = fix_user_path(path) # gh-134300

self.runcommand("""if 1:
import sys as _sys
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
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``.
Loading