consistently use Literal annotation from typing_extensions

This is our standard annotation policy, and makes mypy safe under python
3.7
pull/12139/head
Eli Schwartz 2 years ago
parent 184277bb4a
commit 3ebd570bd5
No known key found for this signature in database
GPG Key ID: CEB167EFB5722BD6
  1. 4
      mesonbuild/dependencies/pkgconfig.py
  2. 2
      mesonbuild/utils/universal.py

@ -26,6 +26,8 @@ import shlex
import typing as T
if T.TYPE_CHECKING:
from typing_extensions import Literal
from ..environment import Environment
from ..mesonlib import MachineChoice
from ..utils.core import EnvironOrDict
@ -78,7 +80,7 @@ class PkgConfigCLI(PkgConfigInterface):
# The class's copy of the pkg-config path. Avoids having to search for it
# multiple times in the same Meson invocation.
class_pkgbin: PerMachine[T.Union[None, T.Literal[False], ExternalProgram]] = PerMachine(None, None)
class_pkgbin: PerMachine[T.Union[None, Literal[False], ExternalProgram]] = PerMachine(None, None)
# We cache all pkg-config subprocess invocations to avoid redundant calls
pkgbin_cache: T.Dict[
T.Tuple[ExternalProgram, T.Tuple[str, ...], T.FrozenSet[T.Tuple[str, str]]],

@ -1361,7 +1361,7 @@ CONF_NASM_PRELUDE = '''; Autogenerated by the Meson build system.
'''
def dump_conf_header(ofilename: str, cdata: 'ConfigurationData', output_format: T.Literal['c', 'nasm']) -> None:
def dump_conf_header(ofilename: str, cdata: 'ConfigurationData', output_format: Literal['c', 'nasm']) -> None:
if output_format == 'c':
prelude = CONF_C_PRELUDE
prefix = '#'

Loading…
Cancel
Save