https://github.com/python/cpython/commit/f0a3c6ebc9bee22ddb318db1143317dc2cf06de1
commit: f0a3c6ebc9bee22ddb318db1143317dc2cf06de1
branch: main
author: Barney Gale <barney.g...@gmail.com>
committer: barneygale <barney.g...@gmail.com>
date: 2025-08-06T17:13:58+01:00
summary:
GH-137466: Remove deprecated and undocumented `glob.glob0()` and `glob1()`
(#137467)
files:
A Misc/NEWS.d/next/Library/2025-08-06-16-13-47.gh-issue-137466.Whv0-A.rst
M Doc/whatsnew/3.15.rst
M Lib/glob.py
M Lib/test/test_glob.py
diff --git a/Doc/whatsnew/3.15.rst b/Doc/whatsnew/3.15.rst
index 54964da473760d..89644a509a0bb4 100644
--- a/Doc/whatsnew/3.15.rst
+++ b/Doc/whatsnew/3.15.rst
@@ -418,6 +418,15 @@ ctypes
(Contributed by Bénédikt Tran in :gh:`133866`.)
+glob
+----
+
+* Removed the undocumented :func:`!glob.glob0` and :func:`!glob.glob1`
+ functions, which have been deprecated since Python 3.13. Use
+ :func:`glob.glob` and pass a directory to its *root_dir* argument instead.
+ (Contributed by Barney Gale in :gh:`137466`.)
+
+
http.server
-----------
diff --git a/Lib/glob.py b/Lib/glob.py
index 1e48fe43167200..5d42077003a240 100644
--- a/Lib/glob.py
+++ b/Lib/glob.py
@@ -122,21 +122,6 @@ def _glob0(dirname, basename, dir_fd, dironly,
include_hidden=False):
return [basename]
return []
-_deprecated_function_message = (
- "{name} is deprecated and will be removed in Python {remove}. Use "
- "glob.glob and pass a directory to its root_dir argument instead."
-)
-
-def glob0(dirname, pattern):
- import warnings
- warnings._deprecated("glob.glob0", _deprecated_function_message,
remove=(3, 15))
- return _glob0(dirname, pattern, None, False)
-
-def glob1(dirname, pattern):
- import warnings
- warnings._deprecated("glob.glob1", _deprecated_function_message,
remove=(3, 15))
- return _glob1(dirname, pattern, None, False)
-
# This helper function recursively yields relative pathnames inside a literal
# directory.
diff --git a/Lib/test/test_glob.py b/Lib/test/test_glob.py
index d0ed5129253cdf..9e4e82b2542c15 100644
--- a/Lib/test/test_glob.py
+++ b/Lib/test/test_glob.py
@@ -4,7 +4,6 @@
import shutil
import sys
import unittest
-import warnings
from test.support import is_wasi, Py_DEBUG
from test.support.os_helper import (TESTFN, skip_unless_symlink,
@@ -393,36 +392,6 @@ def test_glob_many_open_files(self):
for it in iters:
self.assertEqual(next(it), p)
- def test_glob0(self):
- with self.assertWarns(DeprecationWarning):
- glob.glob0(self.tempdir, 'a')
-
- with warnings.catch_warnings():
- warnings.simplefilter('ignore')
- eq = self.assertSequencesEqual_noorder
- eq(glob.glob0(self.tempdir, 'a'), ['a'])
- eq(glob.glob0(self.tempdir, '.bb'), ['.bb'])
- eq(glob.glob0(self.tempdir, '.b*'), [])
- eq(glob.glob0(self.tempdir, 'b'), [])
- eq(glob.glob0(self.tempdir, '?'), [])
- eq(glob.glob0(self.tempdir, '*a'), [])
- eq(glob.glob0(self.tempdir, 'a*'), [])
-
- def test_glob1(self):
- with self.assertWarns(DeprecationWarning):
- glob.glob1(self.tempdir, 'a')
-
- with warnings.catch_warnings():
- warnings.simplefilter('ignore')
- eq = self.assertSequencesEqual_noorder
- eq(glob.glob1(self.tempdir, 'a'), ['a'])
- eq(glob.glob1(self.tempdir, '.bb'), ['.bb'])
- eq(glob.glob1(self.tempdir, '.b*'), ['.bb'])
- eq(glob.glob1(self.tempdir, 'b'), [])
- eq(glob.glob1(self.tempdir, '?'), ['a'])
- eq(glob.glob1(self.tempdir, '*a'), ['a', 'aaa'])
- eq(glob.glob1(self.tempdir, 'a*'), ['a', 'aaa', 'aab'])
-
def test_translate_matching(self):
match = re.compile(glob.translate('*')).match
self.assertIsNotNone(match('foo'))
diff --git
a/Misc/NEWS.d/next/Library/2025-08-06-16-13-47.gh-issue-137466.Whv0-A.rst
b/Misc/NEWS.d/next/Library/2025-08-06-16-13-47.gh-issue-137466.Whv0-A.rst
new file mode 100644
index 00000000000000..918019aa8c03eb
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2025-08-06-16-13-47.gh-issue-137466.Whv0-A.rst
@@ -0,0 +1,3 @@
+Remove undocumented :func:`!glob.glob0` and :func:`!glob.glob1` functions,
+which have been deprecated since Python 3.13. Use :func:`glob.glob` and pass
+a directory to its *root_dir* argument instead.
_______________________________________________
Python-checkins mailing list -- python-checkins@python.org
To unsubscribe send an email to python-checkins-le...@python.org
https://mail.python.org/mailman3//lists/python-checkins.python.org
Member address: arch...@mail-archive.com
