Revert "Simplify sys.abiflags in sysconfig and site"

This reverts commit a5739ba.

Author: XuehaiPan

Lib/sysconfig/__init__.py

@@ -506,6 +506,11 @@ def _init_config_vars():
     base_prefix = _BASE_PREFIX
     base_exec_prefix = _BASE_EXEC_PREFIX
 
+    with warnings.catch_warnings():
+        # ignore DeprecationWarning on sys.abiflags change on Windows
+        warnings.simplefilter('ignore', DeprecationWarning)
+        abiflags = getattr(sys, 'abiflags', '')
+
     if os.name == 'posix':
         _init_posix(_CONFIG_VARS)
         # If we are cross-compiling, load the prefixes from the Makefile instead.
@@ -515,10 +520,6 @@ def _init_config_vars():
             base_prefix = _CONFIG_VARS['host_prefix']
             base_exec_prefix = _CONFIG_VARS['host_exec_prefix']
             abiflags = _CONFIG_VARS['ABIFLAGS']
-        else:
-            abiflags = sys.abiflags
-    else:
-        abiflags = ''  # sys.abiflags is absent on Windows
 
     # Normalized versions of prefix and exec_prefix are handy to have;
     # in fact, these are the standard versions used most places in the

Lib/test/test_sys.py

@@ -719,9 +719,6 @@ def test_attributes(self):
         self.assertIn(sys.float_repr_style, ('short', 'legacy'))
         if not sys.platform.startswith('win'):
             self.assertIsInstance(sys.abiflags, str)
-
-            # test hasattr(sys, 'abiflags') == (os.name != 'nt)
-            self.assertEqual(os.name, 'posix')
         else:
             absent = object()
             with self.assertWarnsRegex(
@@ -746,9 +743,6 @@ def test_attributes(self):
                 ):
                     _ = sys.abiflags
 
-            # test hasattr(sys, 'abiflags') == (os.name != 'nt)
-            self.assertEqual(os.name, 'nt')
-
     def test_thread_info(self):
         info = sys.thread_info
         self.assertEqual(len(info), 3)