Mailman 3 March 2010 - Python-checkins

r78528 - in python/trunk: Doc/library/hashlib.rst Lib/hashlib.py Lib/test/test_hashlib.py
by gregory.p.smith 01 Mar '10

01 Mar '10

Author: gregory.p.smith Date: Mon Mar 1 03:01:47 2010 New Revision: 78528 Log: Adds the hashlib.algorithms attribute. See issue7418. Modified: python/trunk/Doc/library/hashlib.rst python/trunk/Lib/hashlib.py python/trunk/Lib/test/test_hashlib.py Modified: python/trunk/Doc/library/hashlib.rst ============================================================================== --- python/trunk/Doc/library/hashlib.rst (original) +++ python/trunk/Doc/library/hashlib.rst Mon Mar 1 03:01:47 2010 @@ -74,6 +74,15 @@ >>> h.hexdigest() 'cc4a5ce1b3df48aec5d22d1f16b894a0b894eccc' +This module provides the following constant attribute: + +.. data:: hashlib.algorithms + + A tuple providing the names of the hash algorithms guaranteed to be + supported by this module. + + .. versionadded:: 2.7 + The following values are provided as constant attributes of the hash objects returned by the constructors: Modified: python/trunk/Lib/hashlib.py ============================================================================== --- python/trunk/Lib/hashlib.py (original) +++ python/trunk/Lib/hashlib.py Mon Mar 1 03:01:47 2010 @@ -58,7 +58,9 @@ # always available algorithm is added. __always_supported = ('md5', 'sha1', 'sha224', 'sha256', 'sha384', 'sha512') -__all__ = __always_supported + ('new',) +algorithms = __always_supported + +__all__ = __always_supported + ('new', 'algorithms') def __get_builtin_constructor(name): Modified: python/trunk/Lib/test/test_hashlib.py ============================================================================== --- python/trunk/Lib/test/test_hashlib.py (original) +++ python/trunk/Lib/test/test_hashlib.py Mon Mar 1 03:01:47 2010 @@ -102,6 +102,11 @@ c = cons(a) c.hexdigest() + def test_algorithms_attribute(self): + self.assertEqual(hashlib.algorithms, + tuple([_algo for _algo in self.supported_hash_names if + _algo.islower()])) + def test_unknown_hash(self): try: hashlib.new('spam spam spam spam spam')

1 0

r78527 - in python/trunk: Lib/test/test_thread.py Misc/NEWS Modules/posixmodule.c Python/import.c
by gregory.p.smith 01 Mar '10

01 Mar '10

Author: gregory.p.smith Date: Mon Mar 1 02:22:39 2010 New Revision: 78527 Log: Issue #7242: On Solaris 9 and earlier calling os.fork() from within a thread could raise an incorrect RuntimeError about not holding the import lock. The import lock is now reinitialized after fork. Modified: python/trunk/Lib/test/test_thread.py python/trunk/Misc/NEWS python/trunk/Modules/posixmodule.c python/trunk/Python/import.c Modified: python/trunk/Lib/test/test_thread.py ============================================================================== --- python/trunk/Lib/test/test_thread.py (original) +++ python/trunk/Lib/test/test_thread.py Mon Mar 1 02:22:39 2010 @@ -4,6 +4,7 @@ from test import test_support import thread import time +import sys import weakref from test import lock_tests @@ -196,8 +197,47 @@ locktype = thread.allocate_lock +class TestForkInThread(unittest.TestCase): + def setUp(self): + self.read_fd, self.write_fd = os.pipe() + + def test_forkinthread(self): + if sys.platform.startswith('win'): + from test.test_support import TestSkipped + raise TestSkipped("This test is only appropriate for " + "POSIX-like systems.") + def thread1(): + try: + pid = os.fork() # fork in a thread + except RuntimeError: + sys.exit(0) # exit the child + + if pid == 0: # child + os.close(self.read_fd) + os.write(self.write_fd, "OK") + sys.exit(0) + else: # parent + os.close(self.write_fd) + + thread.start_new_thread(thread1, ()) + self.assertEqual(os.read(self.read_fd, 2), "OK", + "Unable to fork() in thread") + + def tearDown(self): + try: + os.close(self.read_fd) + except OSError: + pass + + try: + os.close(self.write_fd) + except OSError: + pass + + def test_main(): - test_support.run_unittest(ThreadRunningTests, BarrierTest, LockTests) + test_support.run_unittest(ThreadRunningTests, BarrierTest, LockTests, + TestForkInThread) if __name__ == "__main__": test_main() Modified: python/trunk/Misc/NEWS ============================================================================== --- python/trunk/Misc/NEWS (original) +++ python/trunk/Misc/NEWS Mon Mar 1 02:22:39 2010 @@ -87,6 +87,10 @@ - Stop providing crtassem.h symbols when compiling with Visual Studio 2010, as msvcr100.dll is not a platform assembly anymore. +- Issue #7242: On Solaris 9 and earlier calling os.fork() from within a + thread could raise an incorrect RuntimeError about not holding the import + lock. The import lock is now reinitialized after fork. + Tests ----- Modified: python/trunk/Modules/posixmodule.c ============================================================================== --- python/trunk/Modules/posixmodule.c (original) +++ python/trunk/Modules/posixmodule.c Mon Mar 1 02:22:39 2010 @@ -3605,14 +3605,18 @@ posix_fork1(PyObject *self, PyObject *noargs) { pid_t pid; - int result; + int result = 0; _PyImport_AcquireLock(); pid = fork1(); - result = _PyImport_ReleaseLock(); + if (pid == 0) { + /* child: this clobbers and resets the import lock. */ + PyOS_AfterFork(); + } else { + /* parent: release the import lock. */ + result = _PyImport_ReleaseLock(); + } if (pid == -1) return posix_error(); - if (pid == 0) - PyOS_AfterFork(); if (result < 0) { /* Don't clobber the OSError if the fork failed. */ PyErr_SetString(PyExc_RuntimeError, @@ -3634,14 +3638,18 @@ posix_fork(PyObject *self, PyObject *noargs) { pid_t pid; - int result; + int result = 0; _PyImport_AcquireLock(); pid = fork(); - result = _PyImport_ReleaseLock(); + if (pid == 0) { + /* child: this clobbers and resets the import lock. */ + PyOS_AfterFork(); + } else { + /* parent: release the import lock. */ + result = _PyImport_ReleaseLock(); + } if (pid == -1) return posix_error(); - if (pid == 0) - PyOS_AfterFork(); if (result < 0) { /* Don't clobber the OSError if the fork failed. */ PyErr_SetString(PyExc_RuntimeError, @@ -3759,11 +3767,12 @@ _PyImport_AcquireLock(); pid = forkpty(&master_fd, NULL, NULL, NULL); + if (pid == 0) + PyOS_AfterFork(); + result = _PyImport_ReleaseLock(); if (pid == -1) return posix_error(); - if (pid == 0) - PyOS_AfterFork(); if (result < 0) { /* Don't clobber the OSError if the fork failed. */ PyErr_SetString(PyExc_RuntimeError, Modified: python/trunk/Python/import.c ============================================================================== --- python/trunk/Python/import.c (original) +++ python/trunk/Python/import.c Mon Mar 1 02:22:39 2010 @@ -301,14 +301,18 @@ return 1; } -/* This function used to be called from PyOS_AfterFork to ensure that newly - created child processes do not share locks with the parent, but for some - reason only on AIX systems. Instead of re-initializing the lock, we now - acquire the import lock around fork() calls. */ +/* This function is called from PyOS_AfterFork to ensure that newly + created child processes do not share locks with the parent. + We now acquire the import lock around fork() calls but on some platforms + (Solaris 9 and earlier? see isue7242) that still left us with problems. */ void _PyImport_ReInitLock(void) { + if (import_lock != NULL) + import_lock = PyThread_allocate_lock(); + import_lock_thread = -1; + import_lock_level = 0; } #endif

1 0

r78517 - in python/trunk: Lib/test/test_threading.py Lib/threading.py Misc/NEWS
by gregory.p.smith 01 Mar '10

01 Mar '10

Author: gregory.p.smith Date: Sun Feb 28 19:36:09 2010 New Revision: 78517 Log: Issue #7481: When a threading.Thread failed to start it would leave the instance stuck in initial state and present in threading.enumerate(). Modified: python/trunk/Lib/test/test_threading.py python/trunk/Lib/threading.py python/trunk/Misc/NEWS Modified: python/trunk/Lib/test/test_threading.py ============================================================================== --- python/trunk/Lib/test/test_threading.py (original) +++ python/trunk/Lib/test/test_threading.py Sun Feb 28 19:36:09 2010 @@ -249,6 +249,25 @@ t.join() # else the thread is still running, and we have no way to kill it + def test_limbo_cleanup(self): + # Issue 7481: Failure to start thread should cleanup the limbo map. + def fail_new_thread(*args): + raise thread.error() + _start_new_thread = threading._start_new_thread + threading._start_new_thread = fail_new_thread + try: + t = threading.Thread(target=lambda: None) + try: + t.start() + assert False + except thread.error: + self.assertFalse( + t in threading._limbo, + "Failed to cleanup _limbo map on failure of Thread.start()." + ) + finally: + threading._start_new_thread = _start_new_thread + def test_finalize_runnning_thread(self): # Issue 1402: the PyGILState_Ensure / _Release functions may be called # very late on python exit: on deallocation of a running thread for Modified: python/trunk/Lib/threading.py ============================================================================== --- python/trunk/Lib/threading.py (original) +++ python/trunk/Lib/threading.py Sun Feb 28 19:36:09 2010 @@ -469,7 +469,12 @@ self._note("%s.start(): starting thread", self) with _active_limbo_lock: _limbo[self] = self - _start_new_thread(self.__bootstrap, ()) + try: + _start_new_thread(self.__bootstrap, ()) + except Exception: + with _active_limbo_lock: + del _limbo[self] + raise self.__started.wait() def run(self): Modified: python/trunk/Misc/NEWS ============================================================================== --- python/trunk/Misc/NEWS (original) +++ python/trunk/Misc/NEWS Sun Feb 28 19:36:09 2010 @@ -72,6 +72,9 @@ - Issue #7427: improve the representation of httplib.BadStatusLine exceptions. +- Issue #7481: When a threading.Thread failed to start it would leave the + instance stuck in initial state and present in threading.enumerate(). + Extension Modules -----------------

2 1

r78526 - in python/branches/release31-maint: Lib/subprocess.py Lib/test/test_subprocess.py Misc/NEWS
by gregory.p.smith 01 Mar '10

01 Mar '10

Author: gregory.p.smith Date: Mon Mar 1 01:43:08 2010 New Revision: 78526 Log: Merged revisions 78524 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r78524 | gregory.p.smith | 2010-02-28 16:17:40 -0800 (Sun, 28 Feb 2010) | 10 lines Merged revisions 78523 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r78523 | gregory.p.smith | 2010-02-28 16:05:08 -0800 (Sun, 28 Feb 2010) | 3 lines Issue #1068268: The subprocess module now handles EINTR in internal os.waitpid and os.read system calls where appropriate. ........ ................ Modified: python/branches/release31-maint/ (props changed) python/branches/release31-maint/Lib/subprocess.py python/branches/release31-maint/Lib/test/test_subprocess.py python/branches/release31-maint/Misc/NEWS Modified: python/branches/release31-maint/Lib/subprocess.py ============================================================================== --- python/branches/release31-maint/Lib/subprocess.py (original) +++ python/branches/release31-maint/Lib/subprocess.py Mon Mar 1 01:43:08 2010 @@ -407,6 +407,16 @@ STDOUT = -2 +def _eintr_retry_call(func, *args): + while True: + try: + return func(*args) + except OSError as e: + if e.errno == errno.EINTR: + continue + raise + + def call(*popenargs, **kwargs): """Run command with arguments. Wait for command to complete, then return the returncode attribute. @@ -1134,13 +1144,13 @@ # Wait for exec to fail or succeed; possibly raising an # exception (limited to 1 MB) - data = os.read(errpipe_read, 1048576) + data = _eintr_retry_call(os.read, errpipe_read, 1048576) finally: # be sure the FD is closed no matter what os.close(errpipe_read) if data: - os.waitpid(self.pid, 0) + _eintr_retry_call(os.waitpid, self.pid, 0) child_exception = pickle.loads(data) for fd in (p2cwrite, c2pread, errread): if fd is not None: @@ -1176,7 +1186,7 @@ """Wait for child process to terminate. Returns returncode attribute.""" if self.returncode is None: - pid, sts = os.waitpid(self.pid, 0) + pid, sts = _eintr_retry_call(os.waitpid, self.pid, 0) self._handle_exitstatus(sts) return self.returncode Modified: python/branches/release31-maint/Lib/test/test_subprocess.py ============================================================================== --- python/branches/release31-maint/Lib/test/test_subprocess.py (original) +++ python/branches/release31-maint/Lib/test/test_subprocess.py Mon Mar 1 01:43:08 2010 @@ -4,6 +4,7 @@ import sys import signal import os +import errno import tempfile import time import re @@ -814,6 +815,25 @@ unit_tests.append(ProcessTestCaseNoPoll) +class HelperFunctionTests(unittest.TestCase): + def test_eintr_retry_call(self): + record_calls = [] + def fake_os_func(*args): + record_calls.append(args) + if len(record_calls) == 2: + raise OSError(errno.EINTR, "fake interrupted system call") + return tuple(reversed(args)) + + self.assertEqual((999, 256), + subprocess._eintr_retry_call(fake_os_func, 256, 999)) + self.assertEqual([(256, 999)], record_calls) + # This time there will be an EINTR so it will loop once. + self.assertEqual((666,), + subprocess._eintr_retry_call(fake_os_func, 666)) + self.assertEqual([(256, 999), (666,), (666,)], record_calls) + +unit_tests.append(HelperFunctionTests) + def test_main(): support.run_unittest(*unit_tests) support.reap_children() Modified: python/branches/release31-maint/Misc/NEWS ============================================================================== --- python/branches/release31-maint/Misc/NEWS (original) +++ python/branches/release31-maint/Misc/NEWS Mon Mar 1 01:43:08 2010 @@ -335,6 +335,9 @@ - Issue #7481: When a threading.Thread failed to start it would leave the instance stuck in initial state and present in threading.enumerate(). +- Issue #1068268: The subprocess module now handles EINTR in internal + os.waitpid and os.read system calls where appropriate. + Extension Modules -----------------

1 0

r78525 - in python/branches/release26-maint: Lib/subprocess.py Lib/test/test_subprocess.py Misc/NEWS
by gregory.p.smith 01 Mar '10

01 Mar '10

Author: gregory.p.smith Date: Mon Mar 1 01:35:34 2010 New Revision: 78525 Log: Merged revisions 78523 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r78523 | gregory.p.smith | 2010-02-28 16:05:08 -0800 (Sun, 28 Feb 2010) | 3 lines Issue #1068268: The subprocess module now handles EINTR in internal os.waitpid and os.read system calls where appropriate. ........ Modified: python/branches/release26-maint/ (props changed) python/branches/release26-maint/Lib/subprocess.py python/branches/release26-maint/Lib/test/test_subprocess.py python/branches/release26-maint/Misc/NEWS Modified: python/branches/release26-maint/Lib/subprocess.py ============================================================================== --- python/branches/release26-maint/Lib/subprocess.py (original) +++ python/branches/release26-maint/Lib/subprocess.py Mon Mar 1 01:35:34 2010 @@ -459,6 +459,16 @@ STDOUT = -2 +def _eintr_retry_call(func, *args): + while True: + try: + return func(*args) + except OSError, e: + if e.errno == errno.EINTR: + continue + raise + + def call(*popenargs, **kwargs): """Run command with arguments. Wait for command to complete, then return the returncode attribute. @@ -1114,13 +1124,14 @@ os.close(errwrite) # Wait for exec to fail or succeed; possibly raising exception - data = os.read(errpipe_read, 1048576) # Exceptions limited to 1 MB + # Exception limited to 1M + data = _eintr_retry_call(os.read, errpipe_read, 1048576) finally: # be sure the FD is closed no matter what os.close(errpipe_read) if data != "": - os.waitpid(self.pid, 0) + _eintr_retry_call(os.waitpid, self.pid, 0) child_exception = pickle.loads(data) for fd in (p2cwrite, c2pread, errread): if fd is not None: @@ -1156,7 +1167,7 @@ """Wait for child process to terminate. Returns returncode attribute.""" if self.returncode is None: - pid, sts = os.waitpid(self.pid, 0) + pid, sts = _eintr_retry_call(os.waitpid, self.pid, 0) self._handle_exitstatus(sts) return self.returncode Modified: python/branches/release26-maint/Lib/test/test_subprocess.py ============================================================================== --- python/branches/release26-maint/Lib/test/test_subprocess.py (original) +++ python/branches/release26-maint/Lib/test/test_subprocess.py Mon Mar 1 01:35:34 2010 @@ -4,6 +4,7 @@ import sys import signal import os +import errno import tempfile import time import re @@ -732,8 +733,27 @@ p.terminate() self.assertNotEqual(p.wait(), 0) +class HelperFunctionTests(unittest.TestCase): + def test_eintr_retry_call(self): + record_calls = [] + def fake_os_func(*args): + record_calls.append(args) + if len(record_calls) == 2: + raise OSError(errno.EINTR, "fake interrupted system call") + return tuple(reversed(args)) + + self.assertEqual((999, 256), + subprocess._eintr_retry_call(fake_os_func, 256, 999)) + self.assertEqual([(256, 999)], record_calls) + # This time there will be an EINTR so it will loop once. + self.assertEqual((666,), + subprocess._eintr_retry_call(fake_os_func, 666)) + self.assertEqual([(256, 999), (666,), (666,)], record_calls) + + def test_main(): - test_support.run_unittest(ProcessTestCase) + test_support.run_unittest(ProcessTestCase, + HelperFunctionTests) if hasattr(test_support, "reap_children"): test_support.reap_children() Modified: python/branches/release26-maint/Misc/NEWS ============================================================================== --- python/branches/release26-maint/Misc/NEWS (original) +++ python/branches/release26-maint/Misc/NEWS Mon Mar 1 01:35:34 2010 @@ -235,6 +235,9 @@ - Issue #7481: When a threading.Thread failed to start it would leave the instance stuck in initial state and present in threading.enumerate(). +- Issue #1068268: The subprocess module now handles EINTR in internal + os.waitpid and os.read system calls where appropriate. + Extension Modules -----------------

1 0

r78524 - in python/branches/py3k: Lib/subprocess.py Lib/test/test_subprocess.py Misc/NEWS
by gregory.p.smith 01 Mar '10

01 Mar '10

Author: gregory.p.smith Date: Mon Mar 1 01:17:40 2010 New Revision: 78524 Log: Merged revisions 78523 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r78523 | gregory.p.smith | 2010-02-28 16:05:08 -0800 (Sun, 28 Feb 2010) | 3 lines Issue #1068268: The subprocess module now handles EINTR in internal os.waitpid and os.read system calls where appropriate. ........ Modified: python/branches/py3k/ (props changed) python/branches/py3k/Lib/subprocess.py python/branches/py3k/Lib/test/test_subprocess.py python/branches/py3k/Misc/NEWS Modified: python/branches/py3k/Lib/subprocess.py ============================================================================== --- python/branches/py3k/Lib/subprocess.py (original) +++ python/branches/py3k/Lib/subprocess.py Mon Mar 1 01:17:40 2010 @@ -406,6 +406,16 @@ STDOUT = -2 +def _eintr_retry_call(func, *args): + while True: + try: + return func(*args) + except OSError as e: + if e.errno == errno.EINTR: + continue + raise + + def call(*popenargs, **kwargs): """Run command with arguments. Wait for command to complete, then return the returncode attribute. @@ -1133,13 +1143,13 @@ # Wait for exec to fail or succeed; possibly raising an # exception (limited to 1 MB) - data = os.read(errpipe_read, 1048576) + data = _eintr_retry_call(os.read, errpipe_read, 1048576) finally: # be sure the FD is closed no matter what os.close(errpipe_read) if data: - os.waitpid(self.pid, 0) + _eintr_retry_call(os.waitpid, self.pid, 0) child_exception = pickle.loads(data) for fd in (p2cwrite, c2pread, errread): if fd is not None: @@ -1175,7 +1185,7 @@ """Wait for child process to terminate. Returns returncode attribute.""" if self.returncode is None: - pid, sts = os.waitpid(self.pid, 0) + pid, sts = _eintr_retry_call(os.waitpid, self.pid, 0) self._handle_exitstatus(sts) return self.returncode Modified: python/branches/py3k/Lib/test/test_subprocess.py ============================================================================== --- python/branches/py3k/Lib/test/test_subprocess.py (original) +++ python/branches/py3k/Lib/test/test_subprocess.py Mon Mar 1 01:17:40 2010 @@ -4,6 +4,7 @@ import sys import signal import os +import errno import tempfile import time import re @@ -797,12 +798,31 @@ ProcessTestCase.tearDown(self) +class HelperFunctionTests(unittest.TestCase): + def test_eintr_retry_call(self): + record_calls = [] + def fake_os_func(*args): + record_calls.append(args) + if len(record_calls) == 2: + raise OSError(errno.EINTR, "fake interrupted system call") + return tuple(reversed(args)) + + self.assertEqual((999, 256), + subprocess._eintr_retry_call(fake_os_func, 256, 999)) + self.assertEqual([(256, 999)], record_calls) + # This time there will be an EINTR so it will loop once. + self.assertEqual((666,), + subprocess._eintr_retry_call(fake_os_func, 666)) + self.assertEqual([(256, 999), (666,), (666,)], record_calls) + + def test_main(): unit_tests = (ProcessTestCase, POSIXProcessTestCase, Win32ProcessTestCase, CommandTests, - ProcessTestCaseNoPoll) + ProcessTestCaseNoPoll, + HelperFunctionTests) support.run_unittest(*unit_tests) support.reap_children() Modified: python/branches/py3k/Misc/NEWS ============================================================================== --- python/branches/py3k/Misc/NEWS (original) +++ python/branches/py3k/Misc/NEWS Mon Mar 1 01:17:40 2010 @@ -714,6 +714,9 @@ - Issue #7481: When a threading.Thread failed to start it would leave the instance stuck in initial state and present in threading.enumerate(). +- Issue #1068268: The subprocess module now handles EINTR in internal + os.waitpid and os.read system calls where appropriate. + Extension Modules -----------------

1 0

r78523 - in python/trunk: Lib/subprocess.py Lib/test/test_subprocess.py Misc/NEWS
by gregory.p.smith 01 Mar '10

01 Mar '10

Author: gregory.p.smith Date: Mon Mar 1 01:05:08 2010 New Revision: 78523 Log: Issue #1068268: The subprocess module now handles EINTR in internal os.waitpid and os.read system calls where appropriate. Modified: python/trunk/Lib/subprocess.py python/trunk/Lib/test/test_subprocess.py python/trunk/Misc/NEWS Modified: python/trunk/Lib/subprocess.py ============================================================================== --- python/trunk/Lib/subprocess.py (original) +++ python/trunk/Lib/subprocess.py Mon Mar 1 01:05:08 2010 @@ -476,6 +476,16 @@ STDOUT = -2 +def _eintr_retry_call(func, *args): + while True: + try: + return func(*args) + except OSError, e: + if e.errno == errno.EINTR: + continue + raise + + def call(*popenargs, **kwargs): """Run command with arguments. Wait for command to complete, then return the returncode attribute. @@ -1173,13 +1183,14 @@ os.close(errwrite) # Wait for exec to fail or succeed; possibly raising exception - data = os.read(errpipe_read, 1048576) # Exception limited to 1M + # Exception limited to 1M + data = _eintr_retry_call(os.read, errpipe_read, 1048576) finally: # be sure the FD is closed no matter what os.close(errpipe_read) if data != "": - os.waitpid(self.pid, 0) + _eintr_retry_call(os.waitpid, self.pid, 0) child_exception = pickle.loads(data) for fd in (p2cwrite, c2pread, errread): if fd is not None: @@ -1215,7 +1226,7 @@ """Wait for child process to terminate. Returns returncode attribute.""" if self.returncode is None: - pid, sts = os.waitpid(self.pid, 0) + pid, sts = _eintr_retry_call(os.waitpid, self.pid, 0) self._handle_exitstatus(sts) return self.returncode Modified: python/trunk/Lib/test/test_subprocess.py ============================================================================== --- python/trunk/Lib/test/test_subprocess.py (original) +++ python/trunk/Lib/test/test_subprocess.py Mon Mar 1 01:05:08 2010 @@ -4,6 +4,7 @@ import sys import signal import os +import errno import tempfile import time import re @@ -772,11 +773,30 @@ ProcessTestCase.tearDown(self) +class HelperFunctionTests(unittest.TestCase): + def test_eintr_retry_call(self): + record_calls = [] + def fake_os_func(*args): + record_calls.append(args) + if len(record_calls) == 2: + raise OSError(errno.EINTR, "fake interrupted system call") + return tuple(reversed(args)) + + self.assertEqual((999, 256), + subprocess._eintr_retry_call(fake_os_func, 256, 999)) + self.assertEqual([(256, 999)], record_calls) + # This time there will be an EINTR so it will loop once. + self.assertEqual((666,), + subprocess._eintr_retry_call(fake_os_func, 666)) + self.assertEqual([(256, 999), (666,), (666,)], record_calls) + + def test_main(): unit_tests = (ProcessTestCase, POSIXProcessTestCase, Win32ProcessTestCase, - ProcessTestCaseNoPoll) + ProcessTestCaseNoPoll, + HelperFunctionTests) test_support.run_unittest(*unit_tests) test_support.reap_children() Modified: python/trunk/Misc/NEWS ============================================================================== --- python/trunk/Misc/NEWS (original) +++ python/trunk/Misc/NEWS Mon Mar 1 01:05:08 2010 @@ -75,6 +75,9 @@ - Issue #7481: When a threading.Thread failed to start it would leave the instance stuck in initial state and present in threading.enumerate(). +- Issue #1068268: The subprocess module now handles EINTR in internal + os.waitpid and os.read system calls where appropriate. + Extension Modules -----------------

1 0