Apply suggestions from code review

Author: vstinner

Lib/test/test_cext/__init__.py

@@ -54,17 +54,21 @@ def test_build_limited(self):
     def test_build_limited_c11(self):
         self.check_build('_test_limited_c11_cext', limited=True, std='c11')
 
-    def test_build_opaque(self):
+    def test_build_opaque_pyobject(self):
         # Test with _Py_OPAQUE_PYOBJECT
-        self.check_build('_test_limited_opaque_cext', limited=True, opaque=True)
+        self.check_build('_test_limited_opaque_cext', limited=True,
+                         opaque_pyobject=True)
 
-    def check_build(self, extension_name, std=None, limited=False, opaque=False):
+    def check_build(self, extension_name, std=None, limited=False,
+                    opaque_pyobject=False):
         venv_dir = 'env'
         with support.setup_venv_with_pip_setuptools(venv_dir) as python_exe:
             self._check_build(extension_name, python_exe,
-                              std=std, limited=limited, opaque=opaque)
+                              std=std, limited=limited,
+                              opaque_pyobject=opaque_pyobject)
 
-    def _check_build(self, extension_name, python_exe, std, limited, opaque):
+    def _check_build(self, extension_name, python_exe, std, limited,
+                     opaque_pyobject):
         pkg_dir = 'pkg'
         os.mkdir(pkg_dir)
         shutil.copy(SETUP, os.path.join(pkg_dir, os.path.basename(SETUP)))
@@ -78,7 +82,7 @@ def run_cmd(operation, cmd):
                 env['CPYTHON_TEST_STD'] = std
             if limited:
                 env['CPYTHON_TEST_LIMITED'] = '1'
-            if opaque:
+            if opaque_pyobject:
                 env['CPYTHON_TEST_OPAQUE_PYOBJECT'] = '1'
             env['CPYTHON_TEST_EXT_NAME'] = extension_name
             if support.verbose:

Lib/test/test_cext/setup.py

@@ -45,7 +45,7 @@ def main():
     std = os.environ.get("CPYTHON_TEST_STD", "")
     module_name = os.environ["CPYTHON_TEST_EXT_NAME"]
     limited = bool(os.environ.get("CPYTHON_TEST_LIMITED", ""))
-    opaque = bool(os.environ.get("CPYTHON_TEST_OPAQUE_PYOBJECT", ""))
+    opaque_pyobject = bool(os.environ.get("CPYTHON_TEST_OPAQUE_PYOBJECT", ""))
 
     sources = [SOURCE]
 
@@ -79,8 +79,7 @@ def main():
         cflags.append(f'-DPy_LIMITED_API={version:#x}')
 
     # Define _Py_OPAQUE_PYOBJECT macro
-    if opaque:
-        version = sys.hexversion
+    if opaque_pyobject:
         cflags.append(f'-D_Py_OPAQUE_PYOBJECT')
         sources.append('create_moduledef.c')