mirror of
https://github.com/python/cpython.git
synced 2025-12-31 04:23:37 +00:00
GH-137466: Remove deprecated and undocumented glob.glob0() and glob1() (#137467)
This commit is contained in:
parent
481d5b5455
commit
f0a3c6ebc9
4 changed files with 12 additions and 46 deletions
|
|
@ -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
|
||||
-----------
|
||||
|
||||
|
|
|
|||
15
Lib/glob.py
15
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.
|
||||
|
||||
|
|
|
|||
|
|
@ -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'))
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
Loading…
Add table
Add a link
Reference in a new issue