From c179c18765514d5c37737dec996b4c91cb31477f Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Mon, 2 Oct 2023 16:40:15 -0400 Subject: [PATCH 3/7] python module: refactor pypy detection into a consistent variable (cherry picked from commit 3d3a10ef022284c8377bd9f8e1b1adec73c50d95) --- mesonbuild/scripts/python_info.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mesonbuild/scripts/python_info.py b/mesonbuild/scripts/python_info.py index 65597b121..d17b3a376 100755 --- a/mesonbuild/scripts/python_info.py +++ b/mesonbuild/scripts/python_info.py @@ -72,6 +72,8 @@ def links_against_libpython(): variables = sysconfig.get_config_vars() variables.update({'base_prefix': getattr(sys, 'base_prefix', sys.prefix)}) +is_pypy = '__pypy__' in sys.builtin_module_names + if sys.version_info < (3, 0): suffix = variables.get('SO') elif sys.version_info < (3, 8, 7): @@ -88,7 +90,7 @@ print(json.dumps({ 'install_paths': install_paths, 'version': sysconfig.get_python_version(), 'platform': sysconfig.get_platform(), - 'is_pypy': '__pypy__' in sys.builtin_module_names, + 'is_pypy': is_pypy, 'is_venv': sys.prefix != variables['base_prefix'], 'link_libpython': links_against_libpython(), 'suffix': suffix, -- 2.42.0