110 lines
4.7 KiB
Diff
110 lines
4.7 KiB
Diff
|
From 0e790bd2eb846e90495eb81952cf35cc7fc8766a Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com>
|
||
|
|
Date: Mon, 27 Jun 2022 19:55:16 +0100
|
||
|
|
Subject: [PATCH] Python/Build: Use r instead of rU file read modes
|
||
|
|
|
||
|
|
Fixes Python 3.11 build
|
||
|
|
---
|
||
|
|
python/mozbuild/mozbuild/action/process_define_files.py | 2 +-
|
||
|
|
python/mozbuild/mozbuild/backend/base.py | 2 +-
|
||
|
|
python/mozbuild/mozbuild/preprocessor.py | 6 +++---
|
||
|
|
python/mozbuild/mozbuild/util.py | 4 ++--
|
||
|
|
python/mozbuild/mozpack/files.py | 4 ++--
|
||
|
|
5 files changed, 9 insertions(+), 9 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/python/mozbuild/mozbuild/action/process_define_files.py b/python/mozbuild/mozbuild/action/process_define_files.py
|
||
|
|
index f1d401a..aca59d0 100644
|
||
|
|
--- a/python/mozbuild/mozbuild/action/process_define_files.py
|
||
|
|
+++ b/python/mozbuild/mozbuild/action/process_define_files.py
|
||
|
|
@@ -36,7 +36,7 @@ def process_define_file(output, input):
|
||
|
|
) and not config.substs.get("JS_STANDALONE"):
|
||
|
|
config = PartialConfigEnvironment(mozpath.join(topobjdir, "js", "src"))
|
||
|
|
|
||
|
|
- with open(path, "rU") as input:
|
||
|
|
+ with open(path, "r") as input:
|
||
|
|
r = re.compile(
|
||
|
|
"^\s*#\s*(?P<cmd>[a-z]+)(?:\s+(?P<name>\S+)(?:\s+(?P<value>\S+))?)?", re.U
|
||
|
|
)
|
||
|
|
diff --git a/python/mozbuild/mozbuild/backend/base.py b/python/mozbuild/mozbuild/backend/base.py
|
||
|
|
index 7bc1986..b64a709 100644
|
||
|
|
--- a/python/mozbuild/mozbuild/backend/base.py
|
||
|
|
+++ b/python/mozbuild/mozbuild/backend/base.py
|
||
|
|
@@ -272,7 +272,7 @@ class BuildBackend(LoggingMixin):
|
||
|
|
return status
|
||
|
|
|
||
|
|
@contextmanager
|
||
|
|
- def _write_file(self, path=None, fh=None, readmode="rU"):
|
||
|
|
+ def _write_file(self, path=None, fh=None, readmode="r"):
|
||
|
|
"""Context manager to write a file.
|
||
|
|
|
||
|
|
This is a glorified wrapper around FileAvoidWrite with integration to
|
||
|
|
diff --git a/python/mozbuild/mozbuild/preprocessor.py b/python/mozbuild/mozbuild/preprocessor.py
|
||
|
|
index f7820b9..857f1a6 100644
|
||
|
|
--- a/python/mozbuild/mozbuild/preprocessor.py
|
||
|
|
+++ b/python/mozbuild/mozbuild/preprocessor.py
|
||
|
|
@@ -531,7 +531,7 @@ class Preprocessor:
|
||
|
|
|
||
|
|
if args:
|
||
|
|
for f in args:
|
||
|
|
- with io.open(f, "rU", encoding="utf-8") as input:
|
||
|
|
+ with io.open(f, "r", encoding="utf-8") as input:
|
||
|
|
self.processFile(input=input, output=out)
|
||
|
|
if depfile:
|
||
|
|
mk = Makefile()
|
||
|
|
@@ -860,7 +860,7 @@ class Preprocessor:
|
||
|
|
args = self.applyFilters(args)
|
||
|
|
if not os.path.isabs(args):
|
||
|
|
args = os.path.join(self.curdir, args)
|
||
|
|
- args = io.open(args, "rU", encoding="utf-8")
|
||
|
|
+ args = io.open(args, "r", encoding="utf-8")
|
||
|
|
except Preprocessor.Error:
|
||
|
|
raise
|
||
|
|
except Exception:
|
||
|
|
@@ -914,7 +914,7 @@ class Preprocessor:
|
||
|
|
def preprocess(includes=[sys.stdin], defines={}, output=sys.stdout, marker="#"):
|
||
|
|
pp = Preprocessor(defines=defines, marker=marker)
|
||
|
|
for f in includes:
|
||
|
|
- with io.open(f, "rU", encoding="utf-8") as input:
|
||
|
|
+ with io.open(f, "r", encoding="utf-8") as input:
|
||
|
|
pp.processFile(input=input, output=output)
|
||
|
|
return pp.includes
|
||
|
|
|
||
|
|
diff --git a/python/mozbuild/mozbuild/util.py b/python/mozbuild/mozbuild/util.py
|
||
|
|
index 071daec..b59aabb 100644
|
||
|
|
--- a/python/mozbuild/mozbuild/util.py
|
||
|
|
+++ b/python/mozbuild/mozbuild/util.py
|
||
|
|
@@ -236,7 +236,7 @@ class FileAvoidWrite(BytesIO):
|
||
|
|
still occur, as well as diff capture if requested.
|
||
|
|
"""
|
||
|
|
|
||
|
|
- def __init__(self, filename, capture_diff=False, dry_run=False, readmode="rU"):
|
||
|
|
+ def __init__(self, filename, capture_diff=False, dry_run=False, readmode="r"):
|
||
|
|
BytesIO.__init__(self)
|
||
|
|
self.name = filename
|
||
|
|
assert type(capture_diff) == bool
|
||
|
|
diff --git a/python/mozbuild/mozpack/files.py b/python/mozbuild/mozpack/files.py
|
||
|
|
index 8150e72..001c497 100644
|
||
|
|
--- a/python/mozbuild/mozpack/files.py
|
||
|
|
+++ b/python/mozbuild/mozpack/files.py
|
||
|
|
@@ -554,7 +554,7 @@ class PreprocessedFile(BaseFile):
|
||
|
|
pp = Preprocessor(defines=self.defines, marker=self.marker)
|
||
|
|
pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
|
||
|
|
|
||
|
|
- with _open(self.path, "rU") as input:
|
||
|
|
+ with _open(self.path, "r") as input:
|
||
|
|
with _open(os.devnull, "w") as output:
|
||
|
|
pp.processFile(input=input, output=output)
|
||
|
|
|
||
|
|
@@ -611,7 +611,7 @@ class PreprocessedFile(BaseFile):
|
||
|
|
pp = Preprocessor(defines=self.defines, marker=self.marker)
|
||
|
|
pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
|
||
|
|
|
||
|
|
- with _open(self.path, "rU") as input:
|
||
|
|
+ with _open(self.path, "r") as input:
|
||
|
|
pp.processFile(input=input, output=dest, depfile=deps_out)
|
||
|
|
|
||
|
|
dest.close()
|
||
|
|
--
|
||
|
|
2.36.1
|
||
|
|
|