(original) (raw)

changeset: 91561:bdbfbb57e37e branch: 2.7 parent: 91557:3881c12fa3ae user: Ned Deily nad@acm.org date: Sun Jul 06 16:11:44 2014 -0700 files: Lib/distutils/sysconfig.py Lib/distutils/tests/test_sysconfig.py Misc/NEWS description: Issue #21923: Prevent AttributeError in distutils.sysconfig.customize_compiler due to possible uninitialized _config_vars. Original patch by Alex Gaynor. diff -r 3881c12fa3ae -r bdbfbb57e37e Lib/distutils/sysconfig.py --- a/Lib/distutils/sysconfig.py Sun Jul 06 20:53:27 2014 +0300 +++ b/Lib/distutils/sysconfig.py Sun Jul 06 16:11:44 2014 -0700 @@ -165,7 +165,8 @@ # version and build tools may not support the same set # of CPU architectures for universal builds. global _config_vars - if not _config_vars.get('CUSTOMIZED_OSX_COMPILER', ''): + # Use get_config_var() to ensure _config_vars is initialized. + if not get_config_var('CUSTOMIZED_OSX_COMPILER'): import _osx_support _osx_support.customize_compiler(_config_vars) _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True' diff -r 3881c12fa3ae -r bdbfbb57e37e Lib/distutils/tests/test_sysconfig.py --- a/Lib/distutils/tests/test_sysconfig.py Sun Jul 06 20:53:27 2014 +0300 +++ b/Lib/distutils/tests/test_sysconfig.py Sun Jul 06 16:11:44 2014 -0700 @@ -3,6 +3,9 @@ import test import unittest import shutil +import subprocess +import sys +import textwrap from distutils import sysconfig from distutils.tests import support @@ -99,6 +102,24 @@ self.assertEqual(global_sysconfig.get_config_var('LDSHARED'), sysconfig.get_config_var('LDSHARED')) self.assertEqual(global_sysconfig.get_config_var('CC'), sysconfig.get_config_var('CC')) + def test_customize_compiler_before_get_config_vars(self): + # Issue #21923: test that a Distribution compiler + # instance can be called without an explicit call to + # get_config_vars(). + with open(TESTFN, 'w') as f: + f.writelines(textwrap.dedent('''\ + from distutils.core import Distribution + config = Distribution().get_command_obj('config') + # try_compile may pass or it may fail if no compiler + # is found but it should not raise an exception. + rc = config.try_compile('int x;') + ''')) + p = subprocess.Popen([str(sys.executable), TESTFN], + stdout=subprocess.PIPE, + stderr=subprocess.STDOUT, + universal_newlines=True) + outs, errs = p.communicate() + self.assertEqual(0, p.returncode, "Subprocess failed: " + outs) def test_suite(): diff -r 3881c12fa3ae -r bdbfbb57e37e Misc/NEWS --- a/Misc/NEWS Sun Jul 06 20:53:27 2014 +0300 +++ b/Misc/NEWS Sun Jul 06 16:11:44 2014 -0700 @@ -22,6 +22,9 @@ - Issue #19870: BaseCookie now parses 'secure' and 'httponly' flags. Backport of issue #16611. +- Issue #21923: Prevent AttributeError in distutils.sysconfig.customize_compiler + due to possible uninitialized _config_vars. + What's New in Python 2.7.8? =========================== /nad@acm.org