diff options
| author | Saiyang Gou <gousaiyang@163.com> | 2021-04-21 15:42:55 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-21 23:42:55 +0100 |
| commit | a32f8fe7133aad4f3cf8946534e3b79a5f2659da (patch) | |
| tree | 928495171f025cb05975d53ea1621df05ade92b0 | |
| parent | 7b86e47617d81a4b14d929743425f448971e8c86 (diff) | |
| download | cpython-git-a32f8fe7133aad4f3cf8946534e3b79a5f2659da.tar.gz | |
bpo-43756: Add new audit event for new arguments added to glob.glob (GH-25239)
| -rw-r--r-- | Doc/library/glob.rst | 9 | ||||
| -rw-r--r-- | Lib/glob.py | 1 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Security/2021-04-06-18-07-48.bpo-43756.DLBNqQ.rst | 2 |
3 files changed, 11 insertions, 1 deletions
diff --git a/Doc/library/glob.rst b/Doc/library/glob.rst index 3fdba6937c..215f60d328 100644 --- a/Doc/library/glob.rst +++ b/Doc/library/glob.rst @@ -65,6 +65,7 @@ For example, ``'[?]'`` matches the character ``'?'``. match. .. audit-event:: glob.glob pathname,recursive glob.glob + .. audit-event:: glob.glob/2 pathname,recursive,root_dir,dir_fd glob.glob .. note:: Using the "``**``" pattern in large directory trees may consume @@ -83,6 +84,13 @@ For example, ``'[?]'`` matches the character ``'?'``. without actually storing them all simultaneously. .. audit-event:: glob.glob pathname,recursive glob.iglob + .. audit-event:: glob.glob/2 pathname,recursive,root_dir,dir_fd glob.iglob + + .. versionchanged:: 3.5 + Support for recursive globs using "``**``". + + .. versionchanged:: 3.10 + Added the *root_dir* and *dir_fd* parameters. .. function:: escape(pathname) @@ -128,4 +136,3 @@ default. For example, consider a directory containing :file:`card.gif` and Module :mod:`fnmatch` Shell-style filename (not path) expansion - diff --git a/Lib/glob.py b/Lib/glob.py index a491363f3f..a6cff87350 100644 --- a/Lib/glob.py +++ b/Lib/glob.py @@ -34,6 +34,7 @@ def iglob(pathname, *, root_dir=None, dir_fd=None, recursive=False): zero or more directories and subdirectories. """ sys.audit("glob.glob", pathname, recursive) + sys.audit("glob.glob/2", pathname, recursive, root_dir, dir_fd) if root_dir is not None: root_dir = os.fspath(root_dir) else: diff --git a/Misc/NEWS.d/next/Security/2021-04-06-18-07-48.bpo-43756.DLBNqQ.rst b/Misc/NEWS.d/next/Security/2021-04-06-18-07-48.bpo-43756.DLBNqQ.rst new file mode 100644 index 0000000000..e05fef2d55 --- /dev/null +++ b/Misc/NEWS.d/next/Security/2021-04-06-18-07-48.bpo-43756.DLBNqQ.rst @@ -0,0 +1,2 @@ +Add new audit event ``glob.glob/2`` to incorporate the new *root_dir* and +*dir_fd* arguments added to :func:`glob.glob` and :func:`glob.iglob`. |