Patch-Source: https://www.linuxfromscratch.org/patches/blfs/svn/firefox-140.9.0esr-python_3.14_fixes-1.patch From 95b5674ffdbb965611ae74467558544741e4b3cb Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 4 Apr 2026 16:53:25 -0400 Subject: [PATCH 1/2] python 3.14 fixes Submitted By: Douglas R. Reno Date: 2025-11-24 Initial Package Version: 140.5.0 Upstream Status: Applied in mainline Firefox Origin: Upstream (phabricator D261511, 261512, 262335) Description: Fixes building Firefox, Thunderbird, and Spidermonkey with Python 3.14 by adjusting to various API changes. This includes ast.Str being removed, and changing to ast.Constant. --- python/mach/mach/command_util.py | 2 +- python/mozbuild/mozbuild/frontend/reader.py | 14 +++++++------- .../mozbuild/mozbuild/vendor/rewrite_mozbuild.py | 6 ++---- python/mozbuild/mozbuild/vendor/vendor_python.py | 4 ++++ .../python/jsonschema/jsonschema/validators.py | 5 ++++- 5 files changed, 18 insertions(+), 13 deletions(-) diff --git a/python/mach/mach/command_util.py b/python/mach/mach/command_util.py index 44e13f1..8539bf3 100644 --- a/python/mach/mach/command_util.py +++ b/python/mach/mach/command_util.py @@ -292,7 +292,7 @@ class DecoratorVisitor(ast.NodeVisitor): kwarg_dict = {} for name, arg in zip(["command", "subcommand"], decorator.args): - kwarg_dict[name] = arg.s + kwarg_dict[name] = arg.value for keyword in decorator.keywords: if keyword.arg not in relevant_kwargs: diff --git a/python/mozbuild/mozbuild/frontend/reader.py b/python/mozbuild/mozbuild/frontend/reader.py index 9f6292c..89bf999 100644 --- a/python/mozbuild/mozbuild/frontend/reader.py +++ b/python/mozbuild/mozbuild/frontend/reader.py @@ -470,7 +470,7 @@ class TemplateFunction: return c( ast.Subscript( value=c(ast.Name(id=self._global_name, ctx=ast.Load())), - slice=c(ast.Index(value=c(ast.Str(s=node.id)))), + slice=c(ast.Index(value=c(ast.Constant(value=node.id)))), ctx=node.ctx, ) ) @@ -1039,8 +1039,8 @@ class BuildReader: else: # Others assert isinstance(target.slice, ast.Index) - assert isinstance(target.slice.value, ast.Str) - key = target.slice.value.s + assert isinstance(target.slice.value, ast.Constant) + key = target.slice.value.value elif isinstance(target, ast.Attribute): assert isinstance(target.attr, str) key = target.attr @@ -1051,11 +1051,11 @@ class BuildReader: value = node.value if isinstance(value, ast.List): for v in value.elts: - assert isinstance(v, ast.Str) - yield v.s + assert isinstance(v, ast.Constant) + yield v.value else: - assert isinstance(value, ast.Str) - yield value.s + assert isinstance(value, ast.Constant) + yield value.value assignments = [] diff --git a/python/mozbuild/mozbuild/vendor/rewrite_mozbuild.py b/python/mozbuild/mozbuild/vendor/rewrite_mozbuild.py index cfcc0f1..de06b58 100644 --- a/python/mozbuild/mozbuild/vendor/rewrite_mozbuild.py +++ b/python/mozbuild/mozbuild/vendor/rewrite_mozbuild.py @@ -327,15 +327,13 @@ def assignment_node_to_source_filename_list(code, node): """ if isinstance(node.value, ast.List) and "elts" in node.value._fields: for f in node.value.elts: - if not isinstance(f, ast.Constant) and not isinstance(f, ast.Str): + if not isinstance(f, ast.Constant): log( "Found non-constant source file name in list: ", ast_get_source_segment(code, f), ) return [] - return [ - f.value if isinstance(f, ast.Constant) else f.s for f in node.value.elts - ] + return [f.value for f in node.value.elts] elif isinstance(node.value, ast.ListComp): # SOURCES += [f for f in foo if blah] log("Could not find the files for " + ast_get_source_segment(code, node.value)) diff --git a/python/mozbuild/mozbuild/vendor/vendor_python.py b/python/mozbuild/mozbuild/vendor/vendor_python.py index 9acee94..2801e1b 100644 --- a/python/mozbuild/mozbuild/vendor/vendor_python.py +++ b/python/mozbuild/mozbuild/vendor/vendor_python.py @@ -40,6 +40,10 @@ EXCLUDED_PACKAGES = { # modified 'dummy' version of it so that the dependency checks still succeed, but # if it ever is attempted to be used, it will fail gracefully. "ansicon", + # jsonschema 4.17.3 is incompatible with Python 3.14+, + # but later versions use a dependency with Rust components, which we thus can't vendor. + # For now we apply the minimal patch to jsonschema to make it work again. + "jsonschema", } diff --git a/third_party/python/jsonschema/jsonschema/validators.py b/third_party/python/jsonschema/jsonschema/validators.py index 66e803e..88316a8 100644 --- a/third_party/python/jsonschema/jsonschema/validators.py +++ b/third_party/python/jsonschema/jsonschema/validators.py @@ -875,8 +875,11 @@ class RefResolver: return None uri, fragment = urldefrag(url) for subschema in subschemas: + id = subschema["$id"] + if not isinstance(id, str): + continue target_uri = self._urljoin_cache( - self.resolution_scope, subschema["$id"], + self.resolution_scope, id, ) if target_uri.rstrip("/") == uri.rstrip("/"): if fragment: -- 2.53.0