Mercurial > hg

changeset 46688:7e02e7c721b0 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
grep: convert an exception to bytes for a warning message Caught by pytype: File "/mnt/c/Users/Matt/hg/mercurial/commands.py", line 3457, in grep: Function _bytestr.__init__ was called with the wrong arguments [wrong-arg-types] Expected: (self, ints: Iterable[int]) Actually passed: (self, ints: re.error) The following methods aren't implemented on re.error: __iter__ Differential Revision: https://phab.mercurial-scm.org/D10173
author Matt Harbison <matt_harbison@yahoo.com>
date Thu, 11 Mar 2021 17:16:29 -0500
parents 83ffc49f7e48
children 8408c3198ec1
files mercurial/commands.py
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commands.py	Thu Mar 11 17:14:30 2021 -0500
+++ b/mercurial/commands.py	Thu Mar 11 17:16:29 2021 -0500
@@ -3444,7 +3444,8 @@
         regexp = util.re.compile(pattern, reflags)
     except re.error as inst:
         ui.warn(
-            _(b"grep: invalid match pattern: %s\n") % pycompat.bytestr(inst)
+            _(b"grep: invalid match pattern: %s\n")
+            % stringutil.forcebytestr(inst)
         )
         return 1
     sep, eol = b':', b'\n'