tor-browser

commit f4a3d0ee0ef02a219e56ec5a2ee550b41b0de847
parent 6b58054b18dccb74059680f4f3452da592df2299
Author: Marco Castelluccio <mcastelluccio@mozilla.com>
Date:   Tue, 25 Nov 2025 16:16:49 +0000

Bug 1861626 - Use rtoml, if available, to read toml manifests. r=jmaher

Differential Revision: https://phabricator.services.mozilla.com/D273791

Diffstat:
M
testing/mozbase/manifestparser/manifestparser/toml.py
 | 
16
+++++++++++-----

1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/testing/mozbase/manifestparser/manifestparser/toml.py b/testing/mozbase/manifestparser/manifestparser/toml.py
@@ -59,14 +59,20 @@ def sort_paths(paths):
 
 def parse_toml_str(contents):
     """
-    Parse TOML contents using toml
+    Parse TOML contents using rtoml (fastest), tomllib, or toml
     """
     try:
-        from tomllib import TOMLDecodeError
-        from tomllib import loads as TOMLloads
+        import rtoml
+
+        TOMLDecodeError = ValueError  # rtoml raises ValueError on parse errors
+        TOMLloads = rtoml.loads
     except ImportError:
-        from toml import TomlDecodeError as TOMLDecodeError
-        from toml import loads as TOMLloads
+        try:
+            from tomllib import TOMLDecodeError
+            from tomllib import loads as TOMLloads
+        except ImportError:
+            from toml import TomlDecodeError as TOMLDecodeError
+            from toml import loads as TOMLloads
 
     error = None
     manifest = None