diff options
author | Aarni Koskela <akx@iki.fi> | 2023-03-02 15:55:45 +0200 |
---|---|---|
committer | Aarni Koskela <akx@iki.fi> | 2023-03-02 16:08:34 +0200 |
commit | 9487b2ead7f3594096737a386796bb11d80d220f (patch) | |
tree | 81a46c57d7ad10ad86707a29a07a2df2ef1edc02 | |
parent | 94e533f5d0000b6a956ba11936f4c94ebef2f97c (diff) | |
download | babel-9487b2ead7f3594096737a386796bb11d80d220f.tar.gz |
Improve type annotation for `babel.support.Translations.load`
Fixes #982
-rw-r--r-- | babel/support.py | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/babel/support.py b/babel/support.py index d6ff73a..1b6056f 100644 --- a/babel/support.py +++ b/babel/support.py @@ -17,7 +17,7 @@ import gettext import locale import os from collections.abc import Iterator -from typing import TYPE_CHECKING, Any, Callable +from typing import TYPE_CHECKING, Any, Callable, Iterable from babel.core import Locale from babel.dates import format_date, format_datetime, format_time, format_timedelta @@ -615,7 +615,7 @@ class Translations(NullTranslations, gettext.GNUTranslations): def load( cls, dirname: str | os.PathLike[str] | None = None, - locales: list[str] | tuple[str, ...] | str | None = None, + locales: Iterable[str | Locale] | str | Locale | None = None, domain: str | None = None, ) -> NullTranslations: """Load translations from the given directory. @@ -626,13 +626,9 @@ class Translations(NullTranslations, gettext.GNUTranslations): strings) :param domain: the message domain (default: 'messages') """ - if locales is not None: - if not isinstance(locales, (list, tuple)): - locales = [locales] - locales = [str(locale) for locale in locales] if not domain: domain = cls.DEFAULT_DOMAIN - filename = gettext.find(domain, dirname, locales) + filename = gettext.find(domain, dirname, _locales_to_names(locales)) if not filename: return NullTranslations() with open(filename, 'rb') as fp: @@ -683,3 +679,18 @@ class Translations(NullTranslations, gettext.GNUTranslations): self.files.extend(translations.files) return self + + +def _locales_to_names( + locales: Iterable[str | Locale] | str | Locale | None, +) -> list[str] | None: + """ + Normalize a `locales` argument to a list of locale names. + """ + if locales is None: + return None + if isinstance(locales, Locale): + return [str(locale)] + if isinstance(locales, str): + return [locales] + return [str(locale) for locale in locales] |