Skip to content

gettext: fix unconstrained TypeVar #7935

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AlexWaygood merged 4 commits into from
May 26, 2022
Merged

gettext: fix unconstrained TypeVar #7935

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dfd9ed7
gettext: fix unconstrained TypeVar
JelleZijlstra May 24, 2022
54a76a1
use the right Callable
JelleZijlstra May 24, 2022
4ff7f8d
everything is NullTranslations
JelleZijlstra May 25, 2022
bfeaf60
Fewer overloads
JelleZijlstra May 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 36 additions & 16 deletions stdlib/gettext.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import io
import sys
from _typeshed import StrPath
from collections.abc import Container, Iterable, Sequence
from collections.abc import Callable, Container, Iterable, Sequence
from typing import Any, Protocol, TypeVar, overload
from typing_extensions import Final, Literal

Expand Down Expand Up @@ -110,7 +111,7 @@ def find(
@overload
def find(domain: str, localedir: StrPath | None = ..., languages: Iterable[str] | None = ..., all: bool = ...) -> Any: ...

_T = TypeVar("_T")
_NullTranslationsT = TypeVar("_NullTranslationsT", bound=NullTranslations)

if sys.version_info >= (3, 11):
@overload
Expand All @@ -119,24 +120,33 @@ if sys.version_info >= (3, 11):
localedir: StrPath | None = ...,
languages: Iterable[str] | None = ...,
class_: None = ...,
fallback: bool = ...,
) -> NullTranslations: ...
fallback: Literal[False] = ...,
) -> GNUTranslations: ...
@overload
def translation(
domain: str,
localedir: StrPath | None = ...,
languages: Iterable[str] | None = ...,
class_: type[_T] = ...,
*,
class_: Callable[[io.BufferedReader], _NullTranslationsT],
fallback: Literal[False] = ...,
) -> _NullTranslationsT: ...
@overload
def translation(
domain: str,
localedir: StrPath | None,
languages: Iterable[str] | None,
class_: Callable[[io.BufferedReader], _NullTranslationsT],
fallback: Literal[False] = ...,
) -> _T: ...
) -> _NullTranslationsT: ...
@overload
def translation(
domain: str,
localedir: StrPath | None = ...,
languages: Iterable[str] | None = ...,
class_: type[Any] = ...,
fallback: Literal[True] = ...,
) -> Any: ...
class_: Callable[[io.BufferedReader], NullTranslations] | None = ...,
fallback: bool = ...,
) -> NullTranslations: ...
def install(domain: str, localedir: StrPath | None = ..., *, names: Container[str] | None = ...) -> None: ...

else:
Expand All @@ -146,27 +156,37 @@ else:
localedir: StrPath | None = ...,
languages: Iterable[str] | None = ...,
class_: None = ...,
fallback: bool = ...,
fallback: Literal[False] = ...,
codeset: str | None = ...,
) -> NullTranslations: ...
) -> GNUTranslations: ...
@overload
def translation(
domain: str,
localedir: StrPath | None = ...,
languages: Iterable[str] | None = ...,
class_: type[_T] = ...,
*,
class_: Callable[[io.BufferedReader], _NullTranslationsT],
fallback: Literal[False] = ...,
codeset: str | None = ...,
) -> _T: ...
) -> _NullTranslationsT: ...
@overload
def translation(
domain: str,
localedir: StrPath | None,
languages: Iterable[str] | None,
class_: Callable[[io.BufferedReader], _NullTranslationsT],
fallback: Literal[False] = ...,
codeset: str | None = ...,
) -> _NullTranslationsT: ...
@overload
def translation(
domain: str,
localedir: StrPath | None = ...,
languages: Iterable[str] | None = ...,
class_: type[Any] = ...,
fallback: Literal[True] = ...,
class_: Callable[[io.BufferedReader], NullTranslations] | None = ...,
fallback: bool = ...,
codeset: str | None = ...,
) -> Any: ...
) -> NullTranslations: ...
def install(
domain: str, localedir: StrPath | None = ..., codeset: str | None = ..., names: Container[str] | None = ...
) -> None: ...
Expand Down