Mercurial > public > mercurial-scm > hg
comparison mercurial/manifest.py @ 52327:0851d94bfdaa stable
manifest: delay import of `typing.ByteString` for py 3.14 support (issue6940)
Since Python 2.7 and 3.5, `typing.ByteString` was defined as an alias for
`bytes | bytearray | memoryview`, and `bytes` was also accepted as a shorthand
for this, so we have `bytes` sprinkled all over the codebase. But then PEP-688
reversed all of that by deprecating `typing.ByteString` and its successor
`collections.abc.ByteString` in Python 3.12 (as well as the `bytes` shorthand)[1],
and removing it completely in Python 3.14. That leaves us with a couple of
problems, namely defining something useful that spans py3.8-py3.13 and keeps
pytype happy, and finding all of the instances where `bytes` doesn't really mean
`bytes`. The current successor to all of this is `collections.abc.Buffer` in
Python 3.12 (or `typing_extensions.Buffer` in previous versions). However, the
current CI does type checking using Python 3.11 (so the former is not avaiable),
and pytype has issues with importing `typing_extensions.Buffer`[2].
The good news is we don't need to deal with this mess immediately, since the
type annotation evaluation is delayed to the type checking phase, and we're
making no effort at supporting it in all supported versions of Python. So by
delaying the import of this particular symbol, we can still use it for type
checking purposes, but can start assessing Python 3.14 problems without doing a
lot of extra work. Putting this on stable will allow people interested in 3.14
to work on it 4-5 extra months earlier (and apparently there's some interest).
[1] https://peps.python.org/pep-0688/#no-special-meaning-for-bytes
[2] https://github.com/google/pytype/issues/1772
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Mon, 25 Nov 2024 18:56:39 -0500 |
parents | 33f255bf19d9 |
children | 048c11993d6a |
comparison
equal
deleted
inserted
replaced
52325:a782fb584b29 | 52327:0851d94bfdaa |
---|---|
8 from __future__ import annotations | 8 from __future__ import annotations |
9 | 9 |
10 import heapq | 10 import heapq |
11 import itertools | 11 import itertools |
12 import struct | 12 import struct |
13 import typing | |
13 import weakref | 14 import weakref |
14 | 15 |
15 from typing import ( | 16 from typing import ( |
16 ByteString, | |
17 Callable, | 17 Callable, |
18 Collection, | 18 Collection, |
19 Dict, | 19 Dict, |
20 Iterable, | 20 Iterable, |
21 Iterator, | 21 Iterator, |
48 repository, | 48 repository, |
49 ) | 49 ) |
50 from .revlogutils import ( | 50 from .revlogutils import ( |
51 constants as revlog_constants, | 51 constants as revlog_constants, |
52 ) | 52 ) |
53 | |
54 if typing.TYPE_CHECKING: | |
55 from typing import ( | |
56 ByteString, | |
57 ) | |
58 | |
53 | 59 |
54 parsers = policy.importmod('parsers') | 60 parsers = policy.importmod('parsers') |
55 propertycache = util.propertycache | 61 propertycache = util.propertycache |
56 | 62 |
57 # Allow tests to more easily test the alternate path in manifestdict.fastdelta() | 63 # Allow tests to more easily test the alternate path in manifestdict.fastdelta() |