Skip to content

Commit 0860b26

Browse files
bryanwweberwarsawmerwok
authored
gh-91670: Removes SO config variable in sysconfig.py (#91671)
* Removes SO config variable in sysconfig Per @warsaw in #63754, this was deprecated in Python 3.4 and was suggested for removal in Python 3.5. * Add NEWS * Update Misc/NEWS.d/next/Library/2022-04-18-15-23-24.gh-issue-91670.6eyChw.rst Co-authored-by: Éric <merwok@netwok.org> Co-authored-by: Barry Warsaw <barry@python.org> Co-authored-by: Éric <merwok@netwok.org>
1 parent 2f0fc52 commit 0860b26

File tree

4 files changed

+1
-42
lines changed

4 files changed

+1
-42
lines changed

Lib/distutils/tests/test_sysconfig.py

-20
Original file line numberDiff line numberDiff line change
@@ -227,26 +227,6 @@ def test_sysconfig_compiler_vars(self):
227227
self.assertEqual(global_sysconfig.get_config_var('CC'),
228228
sysconfig.get_config_var('CC'))
229229

230-
@unittest.skipIf(sysconfig.get_config_var('EXT_SUFFIX') is None,
231-
'EXT_SUFFIX required for this test')
232-
def test_SO_deprecation(self):
233-
self.assertWarns(DeprecationWarning,
234-
sysconfig.get_config_var, 'SO')
235-
236-
@unittest.skipIf(sysconfig.get_config_var('EXT_SUFFIX') is None,
237-
'EXT_SUFFIX required for this test')
238-
def test_SO_value(self):
239-
with check_warnings(('', DeprecationWarning)):
240-
self.assertEqual(sysconfig.get_config_var('SO'),
241-
sysconfig.get_config_var('EXT_SUFFIX'))
242-
243-
@unittest.skipIf(sysconfig.get_config_var('EXT_SUFFIX') is None,
244-
'EXT_SUFFIX required for this test')
245-
def test_SO_in_vars(self):
246-
vars = sysconfig.get_config_vars()
247-
self.assertIsNotNone(vars['SO'])
248-
self.assertEqual(vars['SO'], vars['EXT_SUFFIX'])
249-
250230
@requires_subprocess()
251231
def test_customize_compiler_before_get_config_vars(self):
252232
# Issue #21923: test that a Distribution compiler

Lib/sysconfig.py

-7
Original file line numberDiff line numberDiff line change
@@ -667,10 +667,6 @@ def get_config_vars(*args):
667667
_CONFIG_VARS['VPATH'] = sys._vpath
668668
if os.name == 'posix':
669669
_init_posix(_CONFIG_VARS)
670-
# For backward compatibility, see issue19555
671-
SO = _CONFIG_VARS.get('EXT_SUFFIX')
672-
if SO is not None:
673-
_CONFIG_VARS['SO'] = SO
674670
if _HAS_USER_BASE:
675671
# Setting 'userbase' is done below the call to the
676672
# init function to enable using 'get_config_var' in
@@ -715,9 +711,6 @@ def get_config_var(name):
715711
716712
Equivalent to get_config_vars().get(name)
717713
"""
718-
if name == 'SO':
719-
import warnings
720-
warnings.warn('SO is deprecated, use EXT_SUFFIX', DeprecationWarning, 2)
721714
return get_config_vars().get(name)
722715

723716

Lib/test/test_sysconfig.py

-15
Original file line numberDiff line numberDiff line change
@@ -463,28 +463,13 @@ def test_srcdir_independent_of_cwd(self):
463463
srcdir2 = sysconfig.get_config_var('srcdir')
464464
self.assertEqual(srcdir, srcdir2)
465465

466-
@unittest.skipIf(sysconfig.get_config_var('EXT_SUFFIX') is None,
467-
'EXT_SUFFIX required for this test')
468-
def test_SO_deprecation(self):
469-
self.assertWarns(DeprecationWarning,
470-
sysconfig.get_config_var, 'SO')
471-
472-
@unittest.skipIf(sysconfig.get_config_var('EXT_SUFFIX') is None,
473-
'EXT_SUFFIX required for this test')
474-
def test_SO_value(self):
475-
with check_warnings(('', DeprecationWarning)):
476-
self.assertEqual(sysconfig.get_config_var('SO'),
477-
sysconfig.get_config_var('EXT_SUFFIX'))
478-
479466
@unittest.skipIf(sysconfig.get_config_var('EXT_SUFFIX') is None,
480467
'EXT_SUFFIX required for this test')
481468
def test_EXT_SUFFIX_in_vars(self):
482469
import _imp
483470
if not _imp.extension_suffixes():
484471
self.skipTest("stub loader has no suffixes")
485472
vars = sysconfig.get_config_vars()
486-
self.assertIsNotNone(vars['SO'])
487-
self.assertEqual(vars['SO'], vars['EXT_SUFFIX'])
488473
self.assertEqual(vars['EXT_SUFFIX'], _imp.extension_suffixes()[0])
489474

490475
@unittest.skipUnless(sys.platform == 'linux' and
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Remove deprecated ``SO`` config variable in :mod:`sysconfig`.

0 commit comments

Comments
 (0)