Mailman 3 June 2011 - Python-checkins

cpython: Issue #12400: fix test_faulthandler if regrtest captures sys.stderr
by victor.stinner June 29, 2011

June 29, 2011

http://hg.python.org/cpython/rev/80c7d63325f6 changeset: 71065:80c7d63325f6 user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Wed Jun 29 13:44:05 2011 +0200 summary: Issue #12400: fix test_faulthandler if regrtest captures sys.stderr faulthandler.enable() requires that sys.stderr has a fileno() method. files: Lib/test/test_faulthandler.py | 32 ++++++++++++++++------ 1 files changed, 23 insertions(+), 9 deletions(-) diff --git a/Lib/test/… [View More]

2 1

cpython (merge 3.2 -> default): (merge 3.2) Issue #12400: remove unused import
by victor.stinner June 29, 2011

June 29, 2011

http://hg.python.org/cpython/rev/9d53612333c7 changeset: 71064:9d53612333c7 parent: 71062:af799df478c6 parent: 71063:69e102bfed2b user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Wed Jun 29 13:24:58 2011 +0200 summary: (merge 3.2) Issue #12400: remove unused import files: Lib/test/regrtest.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py --- a/Lib/test/regrtest.py +++ b/Lib/… [View More]

1 0

cpython (3.2): Issue #12400: remove unused variable
by victor.stinner June 29, 2011

June 29, 2011

http://hg.python.org/cpython/rev/69e102bfed2b changeset: 71063:69e102bfed2b branch: 3.2 parent: 71060:949e0c0f5a38 user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Wed Jun 29 13:24:28 2011 +0200 summary: Issue #12400: remove unused variable files: Lib/test/regrtest.py | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py --- a/Lib/test/regrtest.py +++ b/Lib/test/regrtest.py @@ -159,… [View More]

1 0

cpython: Issue #12400: oops, remove debug code...
by victor.stinner June 29, 2011

June 29, 2011

http://hg.python.org/cpython/rev/af799df478c6 changeset: 71062:af799df478c6 user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Wed Jun 29 13:23:49 2011 +0200 summary: Issue #12400: oops, remove debug code... files: Lib/test/test_os.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py --- a/Lib/test/test_os.py +++ b/Lib/test/test_os.py @@ -40,7 +40,6 @@ tearDown = setUp def … [View More]

1 0

cpython (3.2): Issue #12400: regrtest -W doesn't rerun the tests twice anymore, but captures
by victor.stinner June 29, 2011

June 29, 2011

http://hg.python.org/cpython/rev/949e0c0f5a38 changeset: 71060:949e0c0f5a38 branch: 3.2 parent: 71057:69e26e98bdd4 user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Wed Jun 29 13:00:54 2011 +0200 summary: Issue #12400: regrtest -W doesn't rerun the tests twice anymore, but captures the output and displays it on failure instead. regrtest -v doesn't print the error twice anymore if there is only one error. files: Lib/test/regrtest.py | 36 +++++++++++… [View More]+++++++++++--------- Misc/NEWS | 4 +++ 2 files changed, 29 insertions(+), 11 deletions(-) diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py --- a/Lib/test/regrtest.py +++ b/Lib/test/regrtest.py @@ -25,7 +25,7 @@ -v/--verbose -- run tests in verbose mode with output to stdout -w/--verbose2 -- re-run failed tests in verbose mode --W/--verbose3 -- re-run failed tests in verbose mode immediately +-W/--verbose3 -- display test output on failure -d/--debug -- print traceback for failed tests -q/--quiet -- no output unless one or more tests fail -S/--slow -- print the slowest 10 tests @@ -781,17 +781,27 @@ PASSED test passed """ - support.verbose = verbose # Tell tests to be moderately quiet if use_resources is not None: support.use_resources = use_resources try: - result = runtest_inner(test, verbose, quiet, huntrleaks, debug) - if result[0] == FAILED and rerun_failed: - cleanup_test_droppings(test, verbose) - sys.stdout.flush() - sys.stderr.flush() - print("Re-running test {} in verbose mode".format(test)) - runtest(test, True, quiet, huntrleaks, debug) + if rerun_failed: + support.verbose = True + orig_stderr = sys.stderr + with support.captured_stdout() as stream: + try: + sys.stderr = stream + result = runtest_inner(test, verbose, quiet, huntrleaks, + debug, display_failure=False) + if result[0] == FAILED: + output = stream.getvalue() + orig_stderr.write(output) + orig_stderr.flush() + finally: + sys.stderr = orig_stderr + else: + support.verbose = verbose # Tell tests to be moderately quiet + result = runtest_inner(test, verbose, quiet, huntrleaks, debug, + display_failure=not verbose) return result finally: cleanup_test_droppings(test, verbose) @@ -960,7 +970,8 @@ return False -def runtest_inner(test, verbose, quiet, huntrleaks=False, debug=False): +def runtest_inner(test, verbose, quiet, + huntrleaks=False, debug=False, display_failure=True): support.unload(test) if verbose: capture_stdout = None @@ -1002,7 +1013,10 @@ except KeyboardInterrupt: raise except support.TestFailed as msg: - print("test", test, "failed --", msg, file=sys.stderr) + if display_failure: + print("test", test, "failed --", msg, file=sys.stderr) + else: + print("test", test, "failed", file=sys.stderr) sys.stderr.flush() return FAILED, test_time except: diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -122,6 +122,10 @@ Tests ----- +- Issue #12400: regrtest -W doesn't rerun the tests twice anymore, but captures + the output and displays it on failure instead. regrtest -v doesn't print the + error twice anymore if there is only one error. + - Issue #12141: Install a copy of template C module file so that test_build_ext of test_distutils is no longer silently skipped when run outside of a build directory. -- Repository URL: http://hg.python.org/cpython [View Less]

1 0

cpython (merge 3.2 -> default): (merge 3.2) Issue #12400: regrtest -W doesn't rerun the tests twice anymore,
by victor.stinner June 29, 2011

June 29, 2011

http://hg.python.org/cpython/rev/0172d40fdcd4 changeset: 71061:0172d40fdcd4 parent: 71059:00ca0c2c7bc0 parent: 71060:949e0c0f5a38 user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Wed Jun 29 13:04:35 2011 +0200 summary: (merge 3.2) Issue #12400: regrtest -W doesn't rerun the tests twice anymore, but captures the output and displays it on failure instead. regrtest -v doesn't print the error twice anymore if there is only one error. files: Lib/test/… [View More]regrtest.py | 36 ++++++++++++++++++++++--------- Lib/test/test_os.py | 1 + Misc/NEWS | 4 +++ 3 files changed, 30 insertions(+), 11 deletions(-) diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py --- a/Lib/test/regrtest.py +++ b/Lib/test/regrtest.py @@ -30,7 +30,7 @@ -v/--verbose -- run tests in verbose mode with output to stdout -w/--verbose2 -- re-run failed tests in verbose mode --W/--verbose3 -- re-run failed tests in verbose mode immediately +-W/--verbose3 -- display test output on failure -d/--debug -- print traceback for failed tests -q/--quiet -- no output unless one or more tests fail -S/--slow -- print the slowest 10 tests @@ -831,20 +831,30 @@ PASSED test passed """ - support.verbose = verbose # Tell tests to be moderately quiet if use_resources is not None: support.use_resources = use_resources use_timeout = (timeout is not None) if use_timeout: faulthandler.dump_tracebacks_later(timeout, exit=True) try: - result = runtest_inner(test, verbose, quiet, huntrleaks, debug) - if result[0] == FAILED and rerun_failed: - cleanup_test_droppings(test, verbose) - sys.stdout.flush() - sys.stderr.flush() - print("Re-running test {} in verbose mode".format(test)) - runtest(test, True, quiet, huntrleaks, debug, timeout=timeout) + if rerun_failed: + support.verbose = True + orig_stderr = sys.stderr + with support.captured_stdout() as stream: + try: + sys.stderr = stream + result = runtest_inner(test, verbose, quiet, huntrleaks, + debug, display_failure=False) + if result[0] == FAILED: + output = stream.getvalue() + orig_stderr.write(output) + orig_stderr.flush() + finally: + sys.stderr = orig_stderr + else: + support.verbose = verbose # Tell tests to be moderately quiet + result = runtest_inner(test, verbose, quiet, huntrleaks, debug, + display_failure=not verbose) return result finally: if use_timeout: @@ -1020,7 +1030,8 @@ return False -def runtest_inner(test, verbose, quiet, huntrleaks=False, debug=False): +def runtest_inner(test, verbose, quiet, + huntrleaks=False, debug=False, display_failure=True): support.unload(test) test_time = 0.0 @@ -1058,7 +1069,10 @@ except KeyboardInterrupt: raise except support.TestFailed as msg: - print("test", test, "failed --", msg, file=sys.stderr) + if display_failure: + print("test", test, "failed --", msg, file=sys.stderr) + else: + print("test", test, "failed", file=sys.stderr) sys.stderr.flush() return FAILED, test_time except: diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py --- a/Lib/test/test_os.py +++ b/Lib/test/test_os.py @@ -40,6 +40,7 @@ tearDown = setUp def test_access(self): + self.assertEqual(1,2) f = os.open(support.TESTFN, os.O_CREAT|os.O_RDWR) os.close(f) self.assertTrue(os.access(support.TESTFN, os.W_OK)) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -924,6 +924,10 @@ Tests ----- +- Issue #12400: regrtest -W doesn't rerun the tests twice anymore, but captures + the output and displays it on failure instead. regrtest -v doesn't print the + error twice anymore if there is only one error. + - Issue #12141: Install copies of template C module file so that test_build_ext of test_distutils and test_command_build_ext of test_packaging are no longer silently skipped when -- Repository URL: http://hg.python.org/cpython [View Less]

1 0

cpython: Issue #12303: run sig*wait*() tests in a subprocesss
by victor.stinner June 29, 2011

June 29, 2011

http://hg.python.org/cpython/rev/00ca0c2c7bc0 changeset: 71059:00ca0c2c7bc0 user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Wed Jun 29 10:43:02 2011 +0200 summary: Issue #12303: run sig*wait*() tests in a subprocesss ... instead of using fork(): sig*wait*() functions behave differently (not correctly) after a fork, especially on FreeBSD 6. Skip also test_sigtimedwait_poll() on FreeBSD 6 because of a kernel bug. files: Lib/test/test_signal.py | 139 ++++++… [View More]++++++++++----------- 1 files changed, 82 insertions(+), 57 deletions(-) diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py --- a/Lib/test/test_signal.py +++ b/Lib/test/test_signal.py @@ -520,7 +520,6 @@ functions. """ def setUp(self): - self.hndl_called = False self.has_pthread_kill = hasattr(signal, 'pthread_kill') def handler(self, signum, frame): @@ -610,87 +609,108 @@ @unittest.skipUnless(hasattr(signal, 'pthread_sigmask'), 'need signal.pthread_sigmask()') - @unittest.skipUnless(hasattr(os, 'fork'), 'need os.fork()') - def wait_helper(self, test, handler, blocked): - signum = signal.SIGALRM + def wait_helper(self, test, blocked): + """ + test: body of the "def test(signum):" function. + blocked: number of the blocked signal + """ + code = ''' +import signal +import sys + +def handler(signum, frame): + 1/0 + +def test(signum): +%s + +blocked = %s +signum = signal.SIGALRM + +# child: block and wait the signal +try: + signal.signal(signum, handler) + signal.pthread_sigmask(signal.SIG_BLOCK, [blocked]) + + # Do the tests + test(signum) + + # The handler must not be called on unblock + try: + signal.pthread_sigmask(signal.SIG_UNBLOCK, [blocked]) + except ZeroDivisionError: + print("the signal handler has been called", + file=sys.stderr) + sys.exit(1) +except BaseException as err: + print("error: {}".format(err), file=sys.stderr) + sys.stderr.flush() + sys.exit(1) +''' % (test, blocked) # sig*wait* must be called with the signal blocked: since the current - # process might have several threads running, we fork() a child process - # to have a single thread. - pid = os.fork() - if pid == 0: - # child: block and wait the signal - try: - signal.signal(signum, handler) - signal.pthread_sigmask(signal.SIG_BLOCK, [blocked]) - - # Do the tests - test(signum) - - # The handler must not be called on unblock - try: - signal.pthread_sigmask(signal.SIG_UNBLOCK, [blocked]) - except ZeroDivisionError: - print("the signal handler has been called", - file=sys.stderr) - os._exit(1) - except BaseException as err: - print("error: {}".format(err), file=sys.stderr) - sys.stderr.flush() - os._exit(1) - else: - os._exit(0) - else: - # parent: check that the child correcty received the signal - self.assertEqual(os.waitpid(pid, 0), (pid, 0)) + # process might have several threads running, use a subprocess to have + # a single thread. + assert_python_ok('-c', code) @unittest.skipUnless(hasattr(signal, 'sigwait'), 'need signal.sigwait()') def test_sigwait(self): - def test(signum): + test = ''' signal.alarm(1) - self.assertEqual(signum, signal.sigwait([signum])) + received = signal.sigwait([signum]) + assert received == signum , 'received %s, not %s' % (received, signum) + ''' - self.wait_helper(test, self.handler, signal.SIGALRM) + self.wait_helper(test, signal.SIGALRM) @unittest.skipUnless(hasattr(signal, 'sigwaitinfo'), 'need signal.sigwaitinfo()') def test_sigwaitinfo(self): - def test(signum): + test = ''' signal.alarm(1) info = signal.sigwaitinfo([signum]) - self.assertEqual(signum, info.si_signo) + assert info.si_signo == signum, "info.si_signo != %s" % signum + ''' - self.wait_helper(test, self.handler, signal.SIGALRM) + self.wait_helper(test, signal.SIGALRM) @unittest.skipUnless(hasattr(signal, 'sigtimedwait'), 'need signal.sigtimedwait()') def test_sigtimedwait(self): - def test(signum): + test = ''' signal.alarm(1) info = signal.sigtimedwait([signum], (10, 1000)) - self.assertEqual(signum, info.si_signo) + assert info.si_signo == signum, 'info.si_signo != %s' % signum + ''' - self.wait_helper(test, self.handler, signal.SIGALRM) + self.wait_helper(test, signal.SIGALRM) - # check that polling with sigtimedwait works @unittest.skipUnless(hasattr(signal, 'sigtimedwait'), 'need signal.sigtimedwait()') + # issue #12303: sigtimedwait() takes 30 seconds on FreeBSD 6 (kernel bug) + @unittest.skipIf(sys.platform =='freebsd6', + 'sigtimedwait() with a null timeout doens\'t work on FreeBSD 6') def test_sigtimedwait_poll(self): - def test(signum): - self.kill(signum) + # check that polling with sigtimedwait works + test = ''' + import os + os.kill(os.getpid(), signum) info = signal.sigtimedwait([signum], (0, 0)) - self.assertEqual(signum, info.si_signo) + assert info.si_signo == signum, 'info.si_signo != %s' % signum + ''' - self.wait_helper(test, self.handler, signal.SIGALRM) + self.wait_helper(test, signal.SIGALRM) @unittest.skipUnless(hasattr(signal, 'sigtimedwait'), 'need signal.sigtimedwait()') def test_sigtimedwait_timeout(self): - def test(signum): - self.assertEqual(None, signal.sigtimedwait([signum], (1, 35500))) + test = ''' + received = signal.sigtimedwait([signum], (1, 0)) + assert received is None, "received=%r" % (received,) + ''' - self.wait_helper(test, self.handler, signal.SIGALRM) + self.wait_helper(test, signal.SIGALRM) @unittest.skipUnless(hasattr(signal, 'sigtimedwait'), 'need signal.sigtimedwait()') @@ -700,25 +720,30 @@ self.assertRaises(ValueError, signal.sigtimedwait, [signum], (0, -1)) self.assertRaises(ValueError, signal.sigtimedwait, [signum], (-1, 0)) - def alarm_handler(self, signum, frame): - self.hndl_called = True - @unittest.skipUnless(hasattr(signal, 'sigwaitinfo'), 'need signal.sigwaitinfo()') def test_sigwaitinfo_interrupted(self): - def test(signum): + test = ''' + import errno + + hndl_called = True + def alarm_handler(signum, frame): + hndl_called = False + + signal.signal(signal.SIGALRM, alarm_handler) signal.alarm(1) try: signal.sigwaitinfo([signal.SIGUSR1]) except OSError as e: if e.errno == errno.EINTR: - self.assertTrue(self.hndl_called) + assert hndl_called, "SIGALRM handler not called" else: - self.fail("Expected EINTR to be raised by sigwaitinfo") + raise Exception("Expected EINTR to be raised by sigwaitinfo") else: - self.fail("Expected EINTR to be raised by sigwaitinfo") + raise Exception("Expected EINTR to be raised by sigwaitinfo") + ''' - self.wait_helper(test, self.alarm_handler, signal.SIGUSR1) + self.wait_helper(test, signal.SIGUSR1) @unittest.skipUnless(hasattr(signal, 'sigwait'), 'need signal.sigwait()') -- Repository URL: http://hg.python.org/cpython [View Less]

1 0

r88860 - sandbox/trunk/pep362/pep362.py
by brett.cannon June 29, 2011

June 29, 2011

Author: brett.cannon Date: Wed Jun 29 06:23:28 2011 New Revision: 88860 Log: Fix a spelling mistake in a docstring. Modified: sandbox/trunk/pep362/pep362.py Modified: sandbox/trunk/pep362/pep362.py ============================================================================== --- sandbox/trunk/pep362/pep362.py (original) +++ sandbox/trunk/pep362/pep362.py Wed Jun 29 06:23:28 2011 @@ -59,7 +59,7 @@ * var_args Name of the variable positional parameter, else ''. * … [View More]

1 0

cpython (merge 3.2 -> default): Merge 3.2 to default
by ned.deily June 29, 2011

June 29, 2011

http://hg.python.org/cpython/rev/5fff46383e9d changeset: 71058:5fff46383e9d parent: 71056:6a3f98e9db79 parent: 71057:69e26e98bdd4 user: Ned Deily <nad(a)acm.org> date: Tue Jun 28 20:22:30 2011 -0700 summary: Merge 3.2 to default files: -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> 3.2): Merge 3.2
by ned.deily June 29, 2011

June 29, 2011

http://hg.python.org/cpython/rev/69e26e98bdd4 changeset: 71057:69e26e98bdd4 branch: 3.2 parent: 71041:ecf17d9b0212 parent: 71050:8e0cfba9c8c4 user: Ned Deily <nad(a)acm.org> date: Tue Jun 28 20:19:36 2011 -0700 summary: Merge 3.2 files: Lib/distutils/spawn.py | 29 ++++++++- Lib/distutils/sysconfig.py | 15 ---- Lib/distutils/tests/test_build_ext.py | 47 +++++++++++--- Misc/NEWS | 11 +++ 4 … [View More]files changed, 76 insertions(+), 26 deletions(-) diff --git a/Lib/distutils/spawn.py b/Lib/distutils/spawn.py --- a/Lib/distutils/spawn.py +++ b/Lib/distutils/spawn.py @@ -96,15 +96,42 @@ raise DistutilsExecError( "command '%s' failed with exit status %d" % (cmd[0], rc)) +if sys.platform == 'darwin': + from distutils import sysconfig + _cfg_target = None + _cfg_target_split = None + def _spawn_posix(cmd, search_path=1, verbose=0, dry_run=0): log.info(' '.join(cmd)) if dry_run: return exec_fn = search_path and os.execvp or os.execv + exec_args = [cmd[0], cmd] + if sys.platform == 'darwin': + global _cfg_target, _cfg_target_split + if _cfg_target is None: + _cfg_target = sysconfig.get_config_var( + 'MACOSX_DEPLOYMENT_TARGET') or '' + if _cfg_target: + _cfg_target_split = [int(x) for x in _cfg_target.split('.')] + if _cfg_target: + # ensure that the deployment target of build process is not less + # than that used when the interpreter was built. This ensures + # extension modules are built with correct compatibility values + cur_target = os.environ.get('MACOSX_DEPLOYMENT_TARGET', _cfg_target) + if _cfg_target_split > [int(x) for x in cur_target.split('.')]: + my_msg = ('$MACOSX_DEPLOYMENT_TARGET mismatch: ' + 'now "%s" but "%s" during configure' + % (cur_target, _cfg_target)) + raise DistutilsPlatformError(my_msg) + env = dict(os.environ, + MACOSX_DEPLOYMENT_TARGET=cur_target) + exec_fn = search_path and os.execvpe or os.execve + exec_args.append(env) pid = os.fork() if pid == 0: # in the child try: - exec_fn(cmd[0], cmd) + exec_fn(*exec_args) except OSError as e: sys.stderr.write("unable to execute %s: %s\n" % (cmd[0], e.strerror)) diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py --- a/Lib/distutils/sysconfig.py +++ b/Lib/distutils/sysconfig.py @@ -419,21 +419,6 @@ raise DistutilsPlatformError(my_msg) - # On MacOSX we need to check the setting of the environment variable - # MACOSX_DEPLOYMENT_TARGET: configure bases some choices on it so - # it needs to be compatible. - # If it isn't set we set it to the configure-time value - if sys.platform == 'darwin' and 'MACOSX_DEPLOYMENT_TARGET' in g: - cfg_target = g['MACOSX_DEPLOYMENT_TARGET'] - cur_target = os.getenv('MACOSX_DEPLOYMENT_TARGET', '') - if cur_target == '': - cur_target = cfg_target - os.environ['MACOSX_DEPLOYMENT_TARGET'] = cfg_target - elif [int(x) for x in cfg_target.split('.')] > [int(x) for x in cur_target.split('.')]: - my_msg = ('$MACOSX_DEPLOYMENT_TARGET mismatch: now "%s" but "%s" during configure' - % (cur_target, cfg_target)) - raise DistutilsPlatformError(my_msg) - # On AIX, there are wrong paths to the linker scripts in the Makefile # -- these paths are relative to the Python source, but when installed # the scripts are in another directory. diff --git a/Lib/distutils/tests/test_build_ext.py b/Lib/distutils/tests/test_build_ext.py --- a/Lib/distutils/tests/test_build_ext.py +++ b/Lib/distutils/tests/test_build_ext.py @@ -11,7 +11,8 @@ from distutils.tests.support import LoggingSilencer from distutils.extension import Extension from distutils.errors import ( - CompileError, DistutilsSetupError, UnknownFileError) + CompileError, DistutilsPlatformError, DistutilsSetupError, + UnknownFileError) import unittest from test import support @@ -431,18 +432,43 @@ @unittest.skipUnless(sys.platform == 'darwin', 'test only relevant for MacOSX') - def test_deployment_target(self): - self._try_compile_deployment_target() + def test_deployment_target_default(self): + # Issue 9516: Test that, in the absence of the environment variable, + # an extension module is compiled with the same deployment target as + # the interpreter. + self._try_compile_deployment_target('==', None) + @unittest.skipUnless(sys.platform == 'darwin', 'test only relevant for MacOSX') + def test_deployment_target_too_low(self): + # Issue 9516: Test that an extension module is not allowed to be + # compiled with a deployment target less than that of the interpreter. + self.assertRaises(DistutilsPlatformError, + self._try_compile_deployment_target, '>', '10.1') + + @unittest.skipUnless(sys.platform == 'darwin', 'test only relevant for MacOSX') + def test_deployment_target_higher_ok(self): + # Issue 9516: Test that an extension module can be compiled with a + # deployment target higher than that of the interpreter: the ext + # module may depend on some newer OS feature. + deptarget = sysconfig.get_config_var('MACOSX_DEPLOYMENT_TARGET') + if deptarget: + # increment the minor version number (i.e. 10.6 -> 10.7) + deptarget = [int(x) for x in deptarget.split('.')] + deptarget[-1] += 1 + deptarget = '.'.join(str(i) for i in deptarget) + self._try_compile_deployment_target('<', deptarget) + + def _try_compile_deployment_target(self, operator, target): orig_environ = os.environ os.environ = orig_environ.copy() self.addCleanup(setattr, os, 'environ', orig_environ) - os.environ['MACOSX_DEPLOYMENT_TARGET']='10.1' - self._try_compile_deployment_target() + if target is None: + if os.environ.get('MACOSX_DEPLOYMENT_TARGET'): + del os.environ['MACOSX_DEPLOYMENT_TARGET'] + else: + os.environ['MACOSX_DEPLOYMENT_TARGET'] = target - - def _try_compile_deployment_target(self): deptarget_c = os.path.join(self.tmp_dir, 'deptargetmodule.c') with open(deptarget_c, 'w') as fp: @@ -451,16 +477,17 @@ int dummy; - #if TARGET != MAC_OS_X_VERSION_MIN_REQUIRED + #if TARGET %s MAC_OS_X_VERSION_MIN_REQUIRED + #else #error "Unexpected target" #endif - ''')) + ''' % operator)) + # get the deployment target that the interpreter was built with target = sysconfig.get_config_var('MACOSX_DEPLOYMENT_TARGET') target = tuple(map(int, target.split('.'))) target = '%02d%01d0' % target - deptarget_ext = Extension( 'deptarget', [deptarget_c], diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -25,6 +25,17 @@ Library ------- +- Issue #9516: On Mac OS X, change Distutils to no longer globally attempt to + check or set the MACOSX_DEPLOYMENT_TARGET environment variable for the + interpreter process. This could cause failures in non-Distutils subprocesses + and was unreliable since tests or user programs could modify the interpreter + environment after Distutils set it. Instead, have Distutils set the the + deployment target only in the environment of each build subprocess. It is + still possible to globally override the default by setting + MACOSX_DEPLOYMENT_TARGET before launching the interpreter; its value must be + greater or equal to the default value, the value with which the interpreter + was built. + - Issue #12404: Remove C89 incompatible code from mmap module. Patch by Akira Kitada. -- Repository URL: http://hg.python.org/cpython [View Less]

1 0