Skip to content

gh-103501: Propagate OSError if errno is EMFILE in glob.glob #109517

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

Open
aisk wants to merge 6 commits into
base: main
Choose a base branch
from
+14 −1
Open

gh-103501: Propagate OSError if errno is EMFILE in glob.glob #109517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
18c2812
propagate the OSError if errno is EMFILE in glob.glob
aisk Sep 17, 2023
37a0e1f
Merge branch 'main' into gh-103501
aisk Oct 19, 2023
a3973f0
Merge branch 'main' into gh-103501
aisk Nov 6, 2023
c69dcd8
Merge branch 'main' into gh-103501
aisk Jan 11, 2024
20e5658
Update Misc/NEWS.d/next/Library/2023-09-17-22-56-49.gh-issue-103501.q…
aisk Jan 11, 2024
18e8eec
Merge branch 'main' into gh-103501
aisk Sep 17, 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
5 changes: 4 additions & 1 deletion Lib/glob.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""Filename globbing utility."""

import contextlib
import errno
import os
import re
import fnmatch
Expand Down Expand Up @@ -165,7 +166,9 @@ def _iterdir(dirname, dir_fd, dironly):
finally:
if fd is not None:
os.close(fd)
except OSError:
except OSError as e:
if e.errno == errno.EMFILE:
raise
return

def _listdir(dirname, dir_fd, dironly):
Expand Down
8 changes: 8 additions & 0 deletions Lib/test/test_glob.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
import shutil
import sys
import unittest
from errno import EMFILE
from unittest import mock

from test.support import is_wasi, Py_DEBUG
from test.support.os_helper import (TESTFN, skip_unless_symlink,
Expand Down Expand Up @@ -392,6 +394,12 @@ def test_glob_many_open_files(self):
for it in iters:
self.assertEqual(next(it), p)

def test_glob_too_many_open_files(self):
with mock.patch('os.scandir') as mocked_func:
mocked_func.side_effect = OSError(EMFILE, os.strerror(EMFILE), '.')

self.assertRaises(OSError, glob.glob, '*')

def test_translate_matching(self):
match = re.compile(glob.translate('*')).match
self.assertIsNotNone(match('foo'))
Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2023-09-17-22-56-49.gh-issue-103501.qbepu7.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Raise :exc:`OSError` instead of return ``[]`` in :func:`glob.glob` when max open
file limit reached.
Loading