diff options
| author |   Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2021-08-29 05:57:05 -0700 |
|---|---|---|
| committer |   Michał Górny <mgorny@gentoo.org> | 2021-08-31 10:03:20 +0200 |
| commit | e5507ee1da8bb7a484311cf58238dd3daaae0aed (patch) | |
| tree | 6a7e30f6e479e2070f93538c9b03b08e03fa299b | |
| parent | bpo-43124: Fix smtplib multiple CRLF injection (GH-25987) (GH-28038) (diff) | |
| download | cpython-e5507ee1da8bb7a484311cf58238dd3daaae0aed.tar.gz cpython-e5507ee1da8bb7a484311cf58238dd3daaae0aed.tar.bz2 cpython-e5507ee1da8bb7a484311cf58238dd3daaae0aed.zip | |
bpo-42278: Use tempfile.TemporaryDirectory rather than tempfile.mktemp in pydoc (GH-23200) (GH-28026)
Co-authored-by: Łukasz Langa <lukasz@langa.pl>
(cherry picked from commit c9227df5a9d8e958a2324cf0deba8524d1ded26a)
Co-authored-by: E-Paine <63801254+E-Paine@users.noreply.github.com>
(updated for Python 2.7 by Michał Górny)
| -rwxr-xr-x | Lib/pydoc.py | 11 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Security/2021-08-29-12-39-44.bpo-42278.jvmQz_.rst | 2 |
2 files changed, 8 insertions, 5 deletions
diff --git a/Lib/pydoc.py b/Lib/pydoc.py index 62cc262ccb8..c2f2d310260 100755 --- a/Lib/pydoc.py +++ b/Lib/pydoc.py @@ -1423,15 +1423,16 @@ def pipepager(text, cmd): def tempfilepager(text, cmd): """Page through text by invoking a program on a temporary file.""" + import shutil import tempfile - filename = tempfile.mktemp() - file = open(filename, 'w') - file.write(_encode(text)) - file.close() + tempdir = tempfile.mkdtemp() try: + filename = os.path.join(tempdir, 'pydoc.out') + with open(filename, 'w') as file: + file.write(_encode(text)) os.system(cmd + ' "' + filename + '"') finally: - os.unlink(filename) + shutil.rmtree(tempdir) def ttypager(text): """Page through text on a text terminal.""" diff --git a/Misc/NEWS.d/next/Security/2021-08-29-12-39-44.bpo-42278.jvmQz_.rst b/Misc/NEWS.d/next/Security/2021-08-29-12-39-44.bpo-42278.jvmQz_.rst new file mode 100644 index 00000000000..621c3176700 --- /dev/null +++ b/Misc/NEWS.d/next/Security/2021-08-29-12-39-44.bpo-42278.jvmQz_.rst @@ -0,0 +1,2 @@ +Replaced usage of :func:`tempfile.mktemp` with :func:`tempfile.mkdtemp` +to avoid a potential race condition. |