Bug 1970522 - Replaced 'json' with 'mozfile.json' in python/mach directory. r=firefox-build-system-reviewers,ahochheiden

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

Author: Anutrix

build/mach_initialize.py

@@ -140,6 +140,7 @@ def initialize(topsrcdir, args=()):
         os.path.join(topsrcdir, module)
         for module in (
             os.path.join("python", "mach"),
+            os.path.join("testing", "mozbase", "mozfile"),
             os.path.join("third_party", "python", "packaging"),
             os.path.join("third_party", "python", "filelock"),
         )

configure.py

@@ -16,6 +16,7 @@
 sys.path.insert(0, os.path.join(base_dir, "python", "mozboot"))
 sys.path.insert(0, os.path.join(base_dir, "python", "mozbuild"))
 sys.path.insert(0, os.path.join(base_dir, "third_party", "python", "packaging"))
+sys.path.insert(0, os.path.join(base_dir, "testing", "mozbase", "mozfile"))
 sys.path.insert(0, os.path.join(base_dir, "third_party", "python", "six"))
 sys.path.insert(0, os.path.join(base_dir, "third_party", "python", "looseversion"))
 sys.path.insert(0, os.path.join(base_dir, "third_party", "python", "filelock"))

python/mach/mach/logging.py

@@ -7,14 +7,14 @@
 # logging framework.
 
 import codecs
-import json
 import logging
 import os
 import sys
 import time
 
 import blessed
 from mozbuild.buildversion import mozilla_build_version
+from mozfile import json
 from packaging.version import Version
 
 IS_WINDOWS = sys.platform.startswith("win")

python/mach/mach/site.py

@@ -8,7 +8,6 @@
 import ast
 import enum
 import functools
-import json
 import os
 import platform
 import shutil
@@ -24,6 +23,7 @@
 from typing import Callable, Optional
 
 from filelock import FileLock, Timeout
+from mozfile import json
 from packaging.specifiers import SpecifierSet
 
 from mach.requirements import (

python/mach/mach/telemetry.py

@@ -4,7 +4,6 @@
 
 import configparser
 import importlib.util
-import json
 import os
 import subprocess
 import sys
@@ -15,6 +14,7 @@
 import requests
 from mozbuild.base import BuildEnvironmentNotFoundException, MozbuildObject
 from mozbuild.telemetry import filter_args
+from mozfile import json
 from mozversioncontrol import InvalidRepoPath, get_repository_object
 
 from mach.config import ConfigSettings

python/mach/mach/test/test_site_activation.py

@@ -315,6 +315,7 @@ def _activation_context():
     topsrcdir = Path(buildconfig.topsrcdir)
     required_mach_sys_paths = [
         topsrcdir / "python" / "mach",
+        topsrcdir / "testing" / "mozbase" / "mozfile",
         topsrcdir / "third_party" / "python" / "filelock",
         topsrcdir / "third_party" / "python" / "packaging",
         topsrcdir / "third_party" / "python" / "pip",

python/mozperftest/mozperftest/runner.py

@@ -46,6 +46,7 @@ def _activate_virtualenvs(flavor):
         os.path.join(SRC_ROOT, module)
         for module in (
             os.path.join("python", "mach"),
+            os.path.join("testing", "mozbase", "mozfile"),
             os.path.join("third_party", "python", "packaging"),
             os.path.join("third_party", "python", "filelock"),
         )