Skip to content

[3.14] gh-136744: Remove unnecessary chmod from pydoc.apropos() test. (GH-136746) #139242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 29, 2025
Merged

[3.14] gh-136744: Remove unnecessary chmod from pydoc.apropos() test. (GH-136746) #139242

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2a1c4e
gh-136744: Remove unnecessary chmod from pydoc.apropos() test. (GH-13…
freakboy3742 Sep 22, 2025
fcd62b5
Backport cleanup from GH-139267
freakboy3742 Sep 23, 2025
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
18 changes: 3 additions & 15 deletions Lib/test/test_pydoc/test_pydoc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import _pickle
import pkgutil
import re
import stat
import tempfile
import test.support
import time
Expand Down Expand Up @@ -1300,27 +1299,16 @@ def test_apropos_with_unreadable_dir(self):
self.assertEqual(out.getvalue(), '')
self.assertEqual(err.getvalue(), '')

@os_helper.skip_unless_working_chmod
def test_apropos_empty_doc(self):
pkgdir = os.path.join(TESTFN, 'walkpkg')
if support.is_emscripten:
# Emscripten's readdir implementation is buggy on directories
# with read permission but no execute permission.
old_umask = os.umask(0)
self.addCleanup(os.umask, old_umask)
os.mkdir(pkgdir)
self.addCleanup(rmtree, pkgdir)
init_path = os.path.join(pkgdir, '__init__.py')
with open(init_path, 'w') as fobj:
fobj.write("foo = 1")
current_mode = stat.S_IMODE(os.stat(pkgdir).st_mode)
try:
os.chmod(pkgdir, current_mode & ~stat.S_IEXEC)
with self.restrict_walk_packages(path=[TESTFN]), captured_stdout() as stdout:
pydoc.apropos('')
self.assertIn('walkpkg', stdout.getvalue())
finally:
os.chmod(pkgdir, current_mode)
with self.restrict_walk_packages(path=[TESTFN]), captured_stdout() as stdout:
pydoc.apropos('')
self.assertIn('walkpkg', stdout.getvalue())

def test_url_search_package_error(self):
# URL handler search should cope with packages that raise exceptions
Expand Down
Loading