summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorE-Paine <63801254+E-Paine@users.noreply.github.com>2021-08-29 11:07:51 (GMT)
committerGitHub <noreply@github.com>2021-08-29 11:07:51 (GMT)
commitc9227df5a9d8e958a2324cf0deba8524d1ded26a (patch)
treeb8d3f4bb4d9148babb25405f82ba6e2767a489a3
parent2a8127cafe1d196f858a3ecabf5f1df3eebf9a12 (diff)
downloadcpython-c9227df5a9d8e958a2324cf0deba8524d1ded26a.zip
cpython-c9227df5a9d8e958a2324cf0deba8524d1ded26a.tar.gz
cpython-c9227df5a9d8e958a2324cf0deba8524d1ded26a.tar.bz2
bpo-42278: Use tempfile.TemporaryDirectory rather than tempfile.mktemp in pydoc (GH-23200)
Co-authored-by: Ɓukasz Langa <lukasz@langa.pl>
-rwxr-xr-xLib/pydoc.py13
-rw-r--r--Misc/NEWS.d/next/Security/2021-08-29-12-39-44.bpo-42278.jvmQz_.rst2
2 files changed, 9 insertions, 6 deletions
diff --git a/Lib/pydoc.py b/Lib/pydoc.py
index b2915bf..34a6087 100755
--- a/Lib/pydoc.py
+++ b/Lib/pydoc.py
@@ -1618,13 +1618,14 @@ def pipepager(text, cmd):
def tempfilepager(text, cmd):
"""Page through text by invoking a program on a temporary file."""
import tempfile
- filename = tempfile.mktemp()
- with open(filename, 'w', errors='backslashreplace') as file:
- file.write(text)
- try:
+ with tempfile.TemporaryDirectory() as tempdir:
+ filename = os.path.join(tempdir, 'pydoc.out')
+ with open(filename, 'w', errors='backslashreplace',
+ encoding=os.device_encoding(0) if
+ sys.platform == 'win32' else None
+ ) as file:
+ file.write(text)
os.system(cmd + ' "' + filename + '"')
- finally:
- os.unlink(filename)
def _escape_stdout(text):
# Escape non-encodable characters to avoid encoding errors later
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 0000000..db880cd
--- /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
+:class:`~tempfile.TemporaryDirectory` to avoid a potential race condition.