From e5747a047895e9b1fe18e14f99bc69899586594e Mon Sep 17 00:00:00 2001 From: Nir Soffer Date: Sun, 27 Sep 2015 21:51:37 +0300 Subject: [PATCH] Remove unneeded and unsafe mkstemp replacement test_subprocess.py was using an unsafe mkstemp version if tempfile.mkstemp() was not available. Since it seems to be available on all supported branches, we can remove it. To be more consistent with other usage of tempfile, all mkstemp() calls are using now tempfile.mkstemp(). --- Lib/test/test_subprocess.py | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py index 0efcdbf..c16c9d9 100644 --- a/Lib/test/test_subprocess.py +++ b/Lib/test/test_subprocess.py @@ -32,16 +32,6 @@ else: 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 @@ -666,9 +656,9 @@ class ProcessTestCase(BaseTestCase): 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) @@ -858,7 +848,7 @@ class POSIXProcessTestCase(BaseTestCase): def test_args_string(self): # args is a string - f, fname = mkstemp() + fd, fname = tempfile.mkstemp() os.write(f, "#!/bin/sh\n") os.write(f, "exec '%s' -c 'import sys; sys.exit(47)'\n" % sys.executable) @@ -902,7 +892,7 @@ class POSIXProcessTestCase(BaseTestCase): def test_call_string(self): # call() function with string argument on UNIX - f, fname = mkstemp() + fd, fname = tempfile.mkstemp() os.write(f, "#!/bin/sh\n") os.write(f, "exec '%s' -c 'import sys; sys.exit(47)'\n" % sys.executable) @@ -1058,7 +1048,7 @@ class POSIXProcessTestCase(BaseTestCase): 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 @@ -1379,7 +1369,7 @@ class CommandsWithSpaces (BaseTestCase): def setUp(self): super(CommandsWithSpaces, self).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]))" -- 2.4.3