]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
gh-93939: Use new MODULE_name_STATE in wasm_assets script (GH-95035)
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Wed, 20 Jul 2022 07:17:52 +0000 (00:17 -0700)
committerGitHub <noreply@github.com>
Wed, 20 Jul 2022 07:17:52 +0000 (00:17 -0700)
(cherry picked from commit 0f34c7e2d3163525813dbd644f30db58e6d36af2)

Co-authored-by: Christian Heimes <christian@python.org>
Tools/wasm/wasm_assets.py

index b7e83517cae036de149d26833531d56caa809fed..40acea2efaef27c096fd8b1b30043f93e7d57ff3 100755 (executable)
@@ -175,14 +175,13 @@ def detect_extension_modules(args: argparse.Namespace):
     loc = {}
     exec(data, globals(), loc)
 
-    for name, value in loc["build_time_vars"].items():
-        if value not in {"yes", "missing", "disabled", "n/a"}:
+    for key, value in loc["build_time_vars"].items():
+        if not key.startswith("MODULE_") or not key.endswith("_STATE"):
             continue
-        if not name.startswith("MODULE_"):
-            continue
-        if name.endswith(("_CFLAGS", "_DEPS", "_LDFLAGS")):
-            continue
-        modname = name.removeprefix("MODULE_").lower()
+        if value not in {"yes", "disabled", "missing", "n/a"}:
+            raise ValueError(f"Unsupported value '{value}' for {key}")
+
+        modname = key[7:-6].lower()
         if modname not in modules:
             modules[modname] = value == "yes"
     return modules