Merging upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 5 insertions, 6 deletions

diff --git a/build/pgo/genpgocert.py b/build/pgo/genpgocert.py
index 8edaa47ba9..e844946466 100644
--- a/build/pgo/genpgocert.py
+++ b/build/pgo/genpgocert.py
@@ -20,9 +20,9 @@ from mozfile import NamedTemporaryFile, TemporaryDirectory
 from mozprofile.permissions import ServerLocations
 
 dbFiles = [
-    re.compile("^cert[0-9]+\.db$"),
-    re.compile("^key[0-9]+\.db$"),
-    re.compile("^secmod\.db$"),
+    re.compile(r"^cert[0-9]+\.db$"),
+    re.compile(r"^key[0-9]+\.db$"),
+    re.compile(r"^secmod\.db$"),
 ]
 
 
@@ -77,7 +77,7 @@ def writeCertspecForServerLocations(fd):
         i for i in iter(locations) if i.scheme == "https" and "nocert" not in i.options
     ]:
         customCertOption = False
-        customCertRE = re.compile("^cert=(?:\w+)")
+        customCertRE = re.compile(r"^cert=(?:\w+)")
         for _ in [i for i in loc.options if customCertRE.match(i)]:
             customCertOption = True
             break
diff --git a/build/pgo/profileserver.py b/build/pgo/profileserver.py
index 6eab7889b0..aae5e7997d 100755
--- a/build/pgo/profileserver.py
+++ b/build/pgo/profileserver.py
@@ -17,7 +17,6 @@ from mozhttpd import MozHttpd
 from mozprofile import FirefoxProfile, Preferences
 from mozprofile.permissions import ServerLocations
 from mozrunner import CLI, FirefoxRunner
-from six import string_types
 
 PORT = 8888
 
@@ -120,7 +119,7 @@ if __name__ == "__main__":
         interpolation = {"server": "%s:%d" % httpd.httpd.server_address}
         sp3_interpolation = {"server": "%s:%d" % sp3_httpd.httpd.server_address}
         for k, v in prefs.items():
-            if isinstance(v, string_types):
+            if isinstance(v, str):
                 v = v.format(**interpolation)
             prefs[k] = Preferences.cast(v)