[Python-checkins] cpython (3.4): Issue #25249: Remove unneeded mkstemp helper in test_subprocess
berker.peksag
python-checkins at python.org
Mon Sep 28 12:34:21 CEST 2015
https://hg.python.org/cpython/rev/23f4daf7a211
changeset: 98354:23f4daf7a211
branch: 3.4
parent: 98351:460e6e6fb09a
user: Berker Peksag <berker.peksag at gmail.com>
date: Mon Sep 28 13:33:14 2015 +0300
summary:
Issue #25249: Remove unneeded mkstemp helper in test_subprocess
The helper was added in 76641824cf05 11 years ago and it can be
removed now since all supported Python versions have tempfile.mkstemp().
Patch by Nir Soffer.
files:
Lib/test/test_subprocess.py | 26 +++++++-----------------
1 files changed, 8 insertions(+), 18 deletions(-)
diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -37,16 +37,6 @@
SETBINARY = ''
-try:
- mkstemp = tempfile.mkstemp
-except AttributeError:
- # tempfile.mkstemp is not available
- def mkstemp():
- """Replacement for mkstemp, calling mktemp."""
- fname = tempfile.mktemp()
- return os.open(fname, os.O_RDWR|os.O_CREAT), fname
-
-
class BaseTestCase(unittest.TestCase):
def setUp(self):
# Try to minimize the number of children we have so this test
@@ -1150,9 +1140,9 @@
def test_handles_closed_on_exception(self):
# If CreateProcess exits with an error, ensure the
# duplicate output handles are released
- ifhandle, ifname = mkstemp()
- ofhandle, ofname = mkstemp()
- efhandle, efname = mkstemp()
+ ifhandle, ifname = tempfile.mkstemp()
+ ofhandle, ofname = tempfile.mkstemp()
+ efhandle, efname = tempfile.mkstemp()
try:
subprocess.Popen (["*"], stdin=ifhandle, stdout=ofhandle,
stderr=efhandle)
@@ -1428,7 +1418,7 @@
def test_args_string(self):
# args is a string
- fd, fname = mkstemp()
+ fd, fname = tempfile.mkstemp()
# reopen in text mode
with open(fd, "w", errors="surrogateescape") as fobj:
fobj.write("#!/bin/sh\n")
@@ -1473,7 +1463,7 @@
def test_call_string(self):
# call() function with string argument on UNIX
- fd, fname = mkstemp()
+ fd, fname = tempfile.mkstemp()
# reopen in text mode
with open(fd, "w", errors="surrogateescape") as fobj:
fobj.write("#!/bin/sh\n")
@@ -1666,7 +1656,7 @@
def test_remapping_std_fds(self):
# open up some temporary files
- temps = [mkstemp() for i in range(3)]
+ temps = [tempfile.mkstemp() for i in range(3)]
try:
temp_fds = [fd for fd, fname in temps]
@@ -1711,7 +1701,7 @@
def check_swap_fds(self, stdin_no, stdout_no, stderr_no):
# open up some temporary files
- temps = [mkstemp() for i in range(3)]
+ temps = [tempfile.mkstemp() for i in range(3)]
temp_fds = [fd for fd, fname in temps]
try:
# unlink the files -- we won't need to reopen them
@@ -2442,7 +2432,7 @@
def setUp(self):
super().setUp()
- f, fname = mkstemp(".py", "te st")
+ f, fname = tempfile.mkstemp(".py", "te st")
self.fname = fname.lower ()
os.write(f, b"import sys;"
b"sys.stdout.write('%d %s' % (len(sys.argv), [a.lower () for a in sys.argv]))"
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list