Issue #19760: Silence sysconfig's 'SO' key deprecation warnings in tests.

Change stacklevel in warnings.warn() for 'SO' key to 2.

diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
index 392d63d1d9e3f52d6fa13caeafc7dd944f8b89aa..75537db8d06dbafbbae89ccb2401bf9abfad234e 100644 (file)
--- a/Lib/distutils/sysconfig.py
+++ b/Lib/distutils/sysconfig.py
@@ -575,5 +575,5 @@ def get_config_var(name):
     """
     if name == 'SO':
         import warnings
-        warnings.warn('SO is deprecated, use EXT_SUFFIX', DeprecationWarning)
+        warnings.warn('SO is deprecated, use EXT_SUFFIX', DeprecationWarning, 2)
     return get_config_vars().get(name)

diff --git a/Lib/distutils/tests/test_sysconfig.py b/Lib/distutils/tests/test_sysconfig.py
index e14646edf72be8709f7d2036af50141f12db7fe0..b5fdc98dc97f9c918a3c067d1b059e284d27f244 100644 (file)
--- a/Lib/distutils/tests/test_sysconfig.py
+++ b/Lib/distutils/tests/test_sysconfig.py
@@ -6,7 +6,7 @@ import unittest
 from distutils import sysconfig
 from distutils.ccompiler import get_default_compiler
 from distutils.tests import support
-from test.support import TESTFN, run_unittest
+from test.support import TESTFN, run_unittest, check_warnings
 
 class SysconfigTestCase(support.EnvironGuard, unittest.TestCase):
     def setUp(self):
@@ -166,8 +166,9 @@ class SysconfigTestCase(support.EnvironGuard, unittest.TestCase):
     @unittest.skipIf(sysconfig.get_config_var('EXT_SUFFIX') is None,
                      'EXT_SUFFIX required for this test')
     def test_SO_value(self):
-        self.assertEqual(sysconfig.get_config_var('SO'),
-                         sysconfig.get_config_var('EXT_SUFFIX'))
+        with check_warnings(('', DeprecationWarning)):
+            self.assertEqual(sysconfig.get_config_var('SO'),
+                             sysconfig.get_config_var('EXT_SUFFIX'))
 
     @unittest.skipIf(sysconfig.get_config_var('EXT_SUFFIX') is None,
                      'EXT_SUFFIX required for this test')

diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
index ffa772ea000a5777374b1997d9fb46c421799945..dbf77672054be4374e9ffb2661586fdb83d2573b 100644 (file)
--- a/Lib/sysconfig.py
+++ b/Lib/sysconfig.py
@@ -585,7 +585,7 @@ def get_config_var(name):
     """
     if name == 'SO':
         import warnings
-        warnings.warn('SO is deprecated, use EXT_SUFFIX', DeprecationWarning)
+        warnings.warn('SO is deprecated, use EXT_SUFFIX', DeprecationWarning, 2)
     return get_config_vars().get(name)
 
 

diff --git a/Lib/test/test_sysconfig.py b/Lib/test/test_sysconfig.py
index 5bc3f329ba2e4333453750921d62f36b10ddd3df..804c44671695a96ec605c36373dbaee851ec572c 100644 (file)
--- a/Lib/test/test_sysconfig.py
+++ b/Lib/test/test_sysconfig.py
@@ -5,7 +5,7 @@ import subprocess
 import shutil
 from copy import copy
 
-from test.support import (run_unittest, TESTFN, unlink,
+from test.support import (run_unittest, TESTFN, unlink, check_warnings,
                           captured_stdout, skip_unless_symlink)
 
 import sysconfig
@@ -378,8 +378,9 @@ class TestSysConfig(unittest.TestCase):
     @unittest.skipIf(sysconfig.get_config_var('EXT_SUFFIX') is None,
                      'EXT_SUFFIX required for this test')
     def test_SO_value(self):
-        self.assertEqual(sysconfig.get_config_var('SO'),
-                         sysconfig.get_config_var('EXT_SUFFIX'))
+        with check_warnings(('', DeprecationWarning)):
+            self.assertEqual(sysconfig.get_config_var('SO'),
+                             sysconfig.get_config_var('EXT_SUFFIX'))
 
     @unittest.skipIf(sysconfig.get_config_var('EXT_SUFFIX') is None,
                      'EXT_SUFFIX required for this test')