- tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser][tor-browser-102.7.0esr-12.5-1] amend! Bug 40253: Explicitly allow NoScript in Private Browsing mode.
by Pier Angelo Vendrame (＠pierov) 31 Jan '23

31 Jan '23

Pier Angelo Vendrame pushed to branch tor-browser-102.7.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 5ac078b7 by hackademix at 2023-01-31T12:26:37+01:00 amend! Bug 40253: Explicitly allow NoScript in Private Browsing mode. Bug 41598: Prevent NoScript from being removed/disabled. Bug 40253: Explicitly allow NoScript in Private Browsing mode. - - - - - 1 changed file: - toolkit/mozapps/extensions/internal/XPIDatabase.jsm Changes: ===================================== toolkit/mozapps/extensions/internal/XPIDatabase.jsm ===================================== @@ -854,6 +854,15 @@ class AddonInternal { } } + // Bug 41598: prevent NoScript from being uninstalled/disabled + if (this.id === "{73a6fe31-595d-460b-a920-fcc0f8843232}") { + permissions &= ~( + AddonManager.PERM_CAN_UNINSTALL | + AddonManager.PERM_CAN_DISABLE | + AddonManager.PERM_CAN_CHANGE_PRIVATEBROWSING_ACCESS + ); + } + return permissions; } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/5ac078b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/5ac078b… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.7.0esr-12.0-1] Bug 1799982 - Remove uses of inline flags from XPIDL regexps. r=xpcom-reviewers, kmag a=RyanVM
by Pier Angelo Vendrame (＠pierov) 30 Jan '23

30 Jan '23

Pier Angelo Vendrame pushed to branch base-browser-102.7.0esr-12.0-1 at The Tor Project / Applications / Tor Browser Commits: ec608fde by Andrew McCreight at 2023-01-30T18:09:46+00:00 Bug 1799982 - Remove uses of inline flags from XPIDL regexps. r=xpcom-reviewers,kmag a=RyanVM Apparently the use of these is being turned into an error in Python 3.11. Fortunately, our uses appears to be rather trivial. For t_multilinecomment and t_LCDATA, I dropped the (?s) flag and just replaced the one use of . with (\n|.). (?s) means DOTALL, which means that dot includes any character, including a newline. Otherwise it means dot includes any character except a newline. I took the new t_singlelinecomment from IPDL's parser.py, so I assume it is reasonable enough. t_multilinecomment is also now the same as in IPDL. Differential Revision: https://phabricator.services.mozilla.com/D161738 (cherry picked from commit 9e5dcf54d1f2aea76cd23cccb2f1b39d76ab6e50) - - - - - 1 changed file: - xpcom/idl-parser/xpidl/xpidl.py Changes: ===================================== xpcom/idl-parser/xpidl/xpidl.py ===================================== @@ -1572,13 +1572,13 @@ class IDLParser(object): t_ignore = " \t" def t_multilinecomment(self, t): - r"/\*(?s).*?\*/" + r"/\*(\n|.)*?\*/" t.lexer.lineno += t.value.count("\n") if t.value.startswith("/**"): self._doccomments.append(t.value) def t_singlelinecomment(self, t): - r"(?m)//.*?$" + r"//[^\n]*" def t_IID(self, t): return t @@ -1591,7 +1591,7 @@ class IDLParser(object): return t def t_LCDATA(self, t): - r"(?s)%\{[ ]*C\+\+[ ]*\n(?P<cdata>.*?\n?)%\}[ ]*(C\+\+)?" + r"%\{[ ]*C\+\+[ ]*\n(?P<cdata>(\n|.)*?\n?)%\}[ ]*(C\+\+)?" t.type = "CDATA" t.value = t.lexer.lexmatch.group("cdata") t.lexer.lineno += t.value.count("\n") View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/ec608fd… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/ec608fd… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.7.0esr-12.0-1] Bug 1799982 - Remove uses of inline flags from XPIDL regexps. r=xpcom-reviewers, kmag a=RyanVM
by Pier Angelo Vendrame (＠pierov) 30 Jan '23

30 Jan '23

Pier Angelo Vendrame pushed to branch tor-browser-102.7.0esr-12.0-1 at The Tor Project / Applications / Tor Browser Commits: 7ec236d4 by Andrew McCreight at 2023-01-30T18:09:33+00:00 Bug 1799982 - Remove uses of inline flags from XPIDL regexps. r=xpcom-reviewers,kmag a=RyanVM Apparently the use of these is being turned into an error in Python 3.11. Fortunately, our uses appears to be rather trivial. For t_multilinecomment and t_LCDATA, I dropped the (?s) flag and just replaced the one use of . with (\n|.). (?s) means DOTALL, which means that dot includes any character, including a newline. Otherwise it means dot includes any character except a newline. I took the new t_singlelinecomment from IPDL's parser.py, so I assume it is reasonable enough. t_multilinecomment is also now the same as in IPDL. Differential Revision: https://phabricator.services.mozilla.com/D161738 (cherry picked from commit 9e5dcf54d1f2aea76cd23cccb2f1b39d76ab6e50) - - - - - 1 changed file: - xpcom/idl-parser/xpidl/xpidl.py Changes: ===================================== xpcom/idl-parser/xpidl/xpidl.py ===================================== @@ -1572,13 +1572,13 @@ class IDLParser(object): t_ignore = " \t" def t_multilinecomment(self, t): - r"/\*(?s).*?\*/" + r"/\*(\n|.)*?\*/" t.lexer.lineno += t.value.count("\n") if t.value.startswith("/**"): self._doccomments.append(t.value) def t_singlelinecomment(self, t): - r"(?m)//.*?$" + r"//[^\n]*" def t_IID(self, t): return t @@ -1591,7 +1591,7 @@ class IDLParser(object): return t def t_LCDATA(self, t): - r"(?s)%\{[ ]*C\+\+[ ]*\n(?P<cdata>.*?\n?)%\}[ ]*(C\+\+)?" + r"%\{[ ]*C\+\+[ ]*\n(?P<cdata>(\n|.)*?\n?)%\}[ ]*(C\+\+)?" t.type = "CDATA" t.value = t.lexer.lexmatch.group("cdata") t.lexer.lineno += t.value.count("\n") View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/7ec236d… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/7ec236d… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.7.0esr-12.5-1] Bug 1799982 - Remove uses of inline flags from XPIDL regexps. r=xpcom-reviewers, kmag a=RyanVM
by Pier Angelo Vendrame (＠pierov) 30 Jan '23

30 Jan '23

Pier Angelo Vendrame pushed to branch base-browser-102.7.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: a0bbe6fa by Andrew McCreight at 2023-01-30T18:02:35+01:00 Bug 1799982 - Remove uses of inline flags from XPIDL regexps. r=xpcom-reviewers,kmag a=RyanVM Apparently the use of these is being turned into an error in Python 3.11. Fortunately, our uses appears to be rather trivial. For t_multilinecomment and t_LCDATA, I dropped the (?s) flag and just replaced the one use of . with (\n|.). (?s) means DOTALL, which means that dot includes any character, including a newline. Otherwise it means dot includes any character except a newline. I took the new t_singlelinecomment from IPDL's parser.py, so I assume it is reasonable enough. t_multilinecomment is also now the same as in IPDL. Differential Revision: https://phabricator.services.mozilla.com/D161738 - - - - - 1 changed file: - xpcom/idl-parser/xpidl/xpidl.py Changes: ===================================== xpcom/idl-parser/xpidl/xpidl.py ===================================== @@ -1572,13 +1572,13 @@ class IDLParser(object): t_ignore = " \t" def t_multilinecomment(self, t): - r"/\*(?s).*?\*/" + r"/\*(\n|.)*?\*/" t.lexer.lineno += t.value.count("\n") if t.value.startswith("/**"): self._doccomments.append(t.value) def t_singlelinecomment(self, t): - r"(?m)//.*?$" + r"//[^\n]*" def t_IID(self, t): return t @@ -1591,7 +1591,7 @@ class IDLParser(object): return t def t_LCDATA(self, t): - r"(?s)%\{[ ]*C\+\+[ ]*\n(?P<cdata>.*?\n?)%\}[ ]*(C\+\+)?" + r"%\{[ ]*C\+\+[ ]*\n(?P<cdata>(\n|.)*?\n?)%\}[ ]*(C\+\+)?" t.type = "CDATA" t.value = t.lexer.lexmatch.group("cdata") t.lexer.lineno += t.value.count("\n") View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/a0bbe6f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/a0bbe6f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.7.0esr-12.5-1] Bug 1799982 - Remove uses of inline flags from XPIDL regexps. r=xpcom-reviewers, kmag a=RyanVM
by Pier Angelo Vendrame (＠pierov) 30 Jan '23

30 Jan '23

Pier Angelo Vendrame pushed to branch tor-browser-102.7.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 9e5dcf54 by Andrew McCreight at 2023-01-30T18:59:35+01:00 Bug 1799982 - Remove uses of inline flags from XPIDL regexps. r=xpcom-reviewers,kmag a=RyanVM Apparently the use of these is being turned into an error in Python 3.11. Fortunately, our uses appears to be rather trivial. For t_multilinecomment and t_LCDATA, I dropped the (?s) flag and just replaced the one use of . with (\n|.). (?s) means DOTALL, which means that dot includes any character, including a newline. Otherwise it means dot includes any character except a newline. I took the new t_singlelinecomment from IPDL's parser.py, so I assume it is reasonable enough. t_multilinecomment is also now the same as in IPDL. Differential Revision: https://phabricator.services.mozilla.com/D161738 - - - - - 1 changed file: - xpcom/idl-parser/xpidl/xpidl.py Changes: ===================================== xpcom/idl-parser/xpidl/xpidl.py ===================================== @@ -1572,13 +1572,13 @@ class IDLParser(object): t_ignore = " \t" def t_multilinecomment(self, t): - r"/\*(?s).*?\*/" + r"/\*(\n|.)*?\*/" t.lexer.lineno += t.value.count("\n") if t.value.startswith("/**"): self._doccomments.append(t.value) def t_singlelinecomment(self, t): - r"(?m)//.*?$" + r"//[^\n]*" def t_IID(self, t): return t @@ -1591,7 +1591,7 @@ class IDLParser(object): return t def t_LCDATA(self, t): - r"(?s)%\{[ ]*C\+\+[ ]*\n(?P<cdata>.*?\n?)%\}[ ]*(C\+\+)?" + r"%\{[ ]*C\+\+[ ]*\n(?P<cdata>(\n|.)*?\n?)%\}[ ]*(C\+\+)?" t.type = "CDATA" t.value = t.lexer.lexmatch.group("cdata") t.lexer.lineno += t.value.count("\n") View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/9e5dcf5… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/9e5dcf5… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.7.0esr-12.0-1] Bug 1769631 - Remove 'U' from 'mode' parameters for various 'open' calls to...
by Richard Pospesel (＠richard) 30 Jan '23

30 Jan '23

Richard Pospesel pushed to branch tor-browser-102.7.0esr-12.0-1 at The Tor Project / Applications / Tor Browser Commits: eec2b65f by ahochheiden at 2023-01-30T16:23:29+00:00 Bug 1769631 - Remove 'U' from 'mode' parameters for various 'open' calls to ensure Python3.11 compatibility r=firefox-build-system-reviewers,glandium a=RyanVM The 'U' flag represents "universal newline". It has been deprecated since Python3.3. Since then "universal newline" is the default when a file is opened in text mode (not bytes). In Python3.11 using the 'U' flag throws errors. There should be no harm in removing 'U' from 'open' everywhere it is used, and doing allows the use of Python3.11. For more reading see: https://docs.python.org/3.11/whatsnew/3.11.html#changes-in-the-python-api Differential Revision: https://phabricator.services.mozilla.com/D147721 (cherry picked from commit 3bc6973c9f883820d3a3b177263b79deeb51a61f) - - - - - 6 changed files: - dom/base/usecounters.py - python/mozbuild/mozbuild/action/process_define_files.py - python/mozbuild/mozbuild/backend/base.py - python/mozbuild/mozbuild/preprocessor.py - python/mozbuild/mozbuild/util.py - python/mozbuild/mozpack/files.py Changes: ===================================== dom/base/usecounters.py ===================================== @@ -8,7 +8,7 @@ import re def read_conf(conf_filename): # Can't read/write from a single StringIO, so make a new one for reading. - stream = open(conf_filename, "rU") + stream = open(conf_filename, "r") def parse_counters(stream): for line_num, line in enumerate(stream): ===================================== 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 ) ===================================== 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 ===================================== 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 ===================================== 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 ===================================== 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() View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/eec2b65… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/eec2b65… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.7.0esr-12.0-1] Bug 1769631 - Remove 'U' from 'mode' parameters for various 'open' calls to...
by Richard Pospesel (＠richard) 30 Jan '23

30 Jan '23

Richard Pospesel pushed to branch base-browser-102.7.0esr-12.0-1 at The Tor Project / Applications / Tor Browser Commits: 2e3559a1 by ahochheiden at 2023-01-30T16:22:58+00:00 Bug 1769631 - Remove 'U' from 'mode' parameters for various 'open' calls to ensure Python3.11 compatibility r=firefox-build-system-reviewers,glandium a=RyanVM The 'U' flag represents "universal newline". It has been deprecated since Python3.3. Since then "universal newline" is the default when a file is opened in text mode (not bytes). In Python3.11 using the 'U' flag throws errors. There should be no harm in removing 'U' from 'open' everywhere it is used, and doing allows the use of Python3.11. For more reading see: https://docs.python.org/3.11/whatsnew/3.11.html#changes-in-the-python-api Differential Revision: https://phabricator.services.mozilla.com/D147721 (cherry picked from commit 3bc6973c9f883820d3a3b177263b79deeb51a61f) - - - - - 6 changed files: - dom/base/usecounters.py - python/mozbuild/mozbuild/action/process_define_files.py - python/mozbuild/mozbuild/backend/base.py - python/mozbuild/mozbuild/preprocessor.py - python/mozbuild/mozbuild/util.py - python/mozbuild/mozpack/files.py Changes: ===================================== dom/base/usecounters.py ===================================== @@ -8,7 +8,7 @@ import re def read_conf(conf_filename): # Can't read/write from a single StringIO, so make a new one for reading. - stream = open(conf_filename, "rU") + stream = open(conf_filename, "r") def parse_counters(stream): for line_num, line in enumerate(stream): ===================================== 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 ) ===================================== 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 ===================================== 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 ===================================== 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 ===================================== 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() View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/2e3559a… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/2e3559a… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.7.0esr-12.5-1] Bug 1769631 - Remove 'U' from 'mode' parameters for various 'open' calls to...
by Pier Angelo Vendrame (＠pierov) 30 Jan '23

30 Jan '23

Pier Angelo Vendrame pushed to branch base-browser-102.7.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 19713031 by ahochheiden at 2023-01-30T17:21:13+01:00 Bug 1769631 - Remove 'U' from 'mode' parameters for various 'open' calls to ensure Python3.11 compatibility r=firefox-build-system-reviewers,glandium a=RyanVM The 'U' flag represents "universal newline". It has been deprecated since Python3.3. Since then "universal newline" is the default when a file is opened in text mode (not bytes). In Python3.11 using the 'U' flag throws errors. There should be no harm in removing 'U' from 'open' everywhere it is used, and doing allows the use of Python3.11. For more reading see: https://docs.python.org/3.11/whatsnew/3.11.html#changes-in-the-python-api Differential Revision: https://phabricator.services.mozilla.com/D147721 - - - - - 6 changed files: - dom/base/usecounters.py - python/mozbuild/mozbuild/action/process_define_files.py - python/mozbuild/mozbuild/backend/base.py - python/mozbuild/mozbuild/preprocessor.py - python/mozbuild/mozbuild/util.py - python/mozbuild/mozpack/files.py Changes: ===================================== dom/base/usecounters.py ===================================== @@ -8,7 +8,7 @@ import re def read_conf(conf_filename): # Can't read/write from a single StringIO, so make a new one for reading. - stream = open(conf_filename, "rU") + stream = open(conf_filename, "r") def parse_counters(stream): for line_num, line in enumerate(stream): ===================================== 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 ) ===================================== 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 ===================================== 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 ===================================== 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 ===================================== 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() View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/1971303… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/1971303… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.7.0esr-12.5-1] Bug 1769631 - Remove 'U' from 'mode' parameters for various 'open' calls to...
by Richard Pospesel (＠richard) 30 Jan '23

30 Jan '23

Richard Pospesel pushed to branch tor-browser-102.7.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 3bc6973c by ahochheiden at 2023-01-30T17:13:50+01:00 Bug 1769631 - Remove 'U' from 'mode' parameters for various 'open' calls to ensure Python3.11 compatibility r=firefox-build-system-reviewers,glandium a=RyanVM The 'U' flag represents "universal newline". It has been deprecated since Python3.3. Since then "universal newline" is the default when a file is opened in text mode (not bytes). In Python3.11 using the 'U' flag throws errors. There should be no harm in removing 'U' from 'open' everywhere it is used, and doing allows the use of Python3.11. For more reading see: https://docs.python.org/3.11/whatsnew/3.11.html#changes-in-the-python-api Differential Revision: https://phabricator.services.mozilla.com/D147721 - - - - - 6 changed files: - dom/base/usecounters.py - python/mozbuild/mozbuild/action/process_define_files.py - python/mozbuild/mozbuild/backend/base.py - python/mozbuild/mozbuild/preprocessor.py - python/mozbuild/mozbuild/util.py - python/mozbuild/mozpack/files.py Changes: ===================================== dom/base/usecounters.py ===================================== @@ -8,7 +8,7 @@ import re def read_conf(conf_filename): # Can't read/write from a single StringIO, so make a new one for reading. - stream = open(conf_filename, "rU") + stream = open(conf_filename, "r") def parse_counters(stream): for line_num, line in enumerate(stream): ===================================== 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 ) ===================================== 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 ===================================== 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 ===================================== 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 ===================================== 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() View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/3bc6973… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/3bc6973… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.7.0esr-12.5-1] 2 commits: fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 30 Jan '23

30 Jan '23

Pier Angelo Vendrame pushed to branch tor-browser-102.7.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 43da6d54 by Pier Angelo Vendrame at 2023-01-30T14:40:42+01:00 fixup! Firefox preference overrides. Bug 40788: Disable AS's calls to home. We now also disable more AS tasks, but we could see it as a part of the preferences we set to be sure it stays disabled. - - - - - e8921475 by Pier Angelo Vendrame at 2023-01-30T14:41:32+01:00 Bug 40788: Prevent nsIURLQueryStrippingListService from calling home when it is not enabled. The URL query stripping service is enabled only in nightly builds, still it is initialized and remote settings are downloaded. This adds a condition that prevents the service from being initialized if disabled. Upstream Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1812594 We should remove this patch if Mozilla decides that this is a problem also for them, or if they do not but we decide to use the feature. - - - - - 2 changed files: - browser/app/profile/001-base-profile.js - browser/components/BrowserGlue.jsm Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -178,6 +178,15 @@ pref("browser.newtabpage.activity-stream.default.sites", ""); pref("browser.newtabpage.activity-stream.feeds.telemetry", false); pref("browser.newtabpage.activity-stream.telemetry", false); +// tor-browser#40788: disable AS's calls to home. +// Notice that null is between quotes because it is a JSON string. +// Keep checked firefox.js to see if new entries are added. +pref("browser.newtabpage.activity-stream.asrouter.providers.cfr", "null"); +pref("browser.newtabpage.activity-stream.asrouter.providers.whats-new-panel", "null"); +pref("browser.newtabpage.activity-stream.asrouter.providers.message-groups", "null"); +pref("browser.newtabpage.activity-stream.asrouter.providers.snippets", "null"); +pref("browser.newtabpage.activity-stream.asrouter.providers.messaging-experiments", "null"); + // Disable fetching asrouter.ftl and related console errors (tor-browser#40763). pref("browser.newtabpage.activity-stream.asrouter.useRemoteL10n", false); ===================================== browser/components/BrowserGlue.jsm ===================================== @@ -2698,11 +2698,23 @@ BrowserGlue.prototype = { { task: () => { - // Init the url query stripping list. - let urlQueryStrippingListService = Cc[ - "@mozilla.org/query-stripping-list-service;1" - ].getService(Ci.nsIURLQueryStrippingListService); - urlQueryStrippingListService.init(); + // tor-browser#40788: Do not initialize + // nsIURLQueryStrippingListService to prevent it from initializing + // its remote settings if it's disabled. + // See also https://bugzilla.mozilla.org/show_bug.cgi?id=1812594 + let enabledPref = "privacy.query_stripping.enabled"; + let enabledPBMPref = "privacy.query_stripping.enabled.pbmode"; + + if ( + Services.prefs.getBoolPref(enabledPref, false) || + Services.prefs.getBoolPref(enabledPBMPref, false) + ) { + // Init the url query stripping list. + let urlQueryStrippingListService = Cc[ + "@mozilla.org/query-stripping-list-service;1" + ].getService(Ci.nsIURLQueryStrippingListService); + urlQueryStrippingListService.init(); + } }, }, View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/31831f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/31831f… You're receiving this email because of your account on gitlab.torproject.org.

1 0