Mercurial > public > mercurial-scm > hg
diff mercurial/templater.py @ 49803:55d45d0de4e7
typing: add type hints to pycompat.bytestr
The problem with leaving pytype to its own devices here was that for functions
that returned a bytestr, pytype inferred `Union[bytes, int]`. It now accepts
that it can be treated as plain bytes.
I wasn't able to figure out the arg type for `__getitem__`- `SupportsIndex`
(which PyCharm indicated is how the superclass function is typed) got flagged:
File "/mnt/c/Users/Matt/hg/mercurial/pycompat.py", line 236, in __getitem__:
unsupported operand type(s) for item retrieval: bytestr and SupportsIndex [unsupported-operands]
Function __getitem__ on bytestr expects int
But some caller got flagged when I marked it as `int`.
There's some minor spillover problems elsewhere- pytype doesn't seem to
recognize that `bytes.startswith()` can optionally take a 3rd and 4th arg, so
those few places have the warning disabled. It also flags where the tar API is
being abused, but that would be a tricky refactor (and would require typing
extensions until py3.7 is dropped), so disable those too.
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Wed, 14 Dec 2022 01:51:33 -0500 |
| parents | 642e31cb55f0 |
| children | 18c8c18993f0 |
line wrap: on
line diff
--- a/mercurial/templater.py Wed Dec 14 01:38:52 2022 -0500 +++ b/mercurial/templater.py Wed Dec 14 01:51:33 2022 -0500 @@ -177,10 +177,17 @@ quote = program[pos : pos + 2] s = pos = pos + 2 while pos < end: # find closing escaped quote + # pycompat.bytestr (and bytes) both have .startswith() that + # takes an optional start and an optional end, but pytype thinks + # it only takes 2 args. + + # pytype: disable=wrong-arg-count if program.startswith(b'\\\\\\', pos, end): pos += 4 # skip over double escaped characters continue if program.startswith(quote, pos, end): + # pytype: enable=wrong-arg-count + # interpret as if it were a part of an outer string data = parser.unescapestr(program[s:pos]) if token == b'template': @@ -300,7 +307,14 @@ return parseres, pos = p.parse(tokenize(tmpl, n + 1, stop, b'}')) + + # pycompat.bytestr (and bytes) both have .startswith() that + # takes an optional start and an optional end, but pytype thinks + # it only takes 2 args. + + # pytype: disable=wrong-arg-count if not tmpl.startswith(b'}', pos): + # pytype: enable=wrong-arg-count raise error.ParseError(_(b"invalid token"), pos) yield (b'template', parseres, n) pos += 1