From: Aarni Koskela <akx@iki.fi>
Date: Wed, 8 Jan 2025 14:23:08 +0000 (+0200)
Subject: Unify `str | Locale | None` to `Locale | str | None`
X-Git-Tag: v2.17.0~11^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af558d43ebea1ea8cc680ea3654c4ed778a72432;p=thirdparty%2Fbabel.git

Unify `str | Locale | None` to `Locale | str | None`
---

diff --git a/babel/core.py b/babel/core.py
index e3fb7c8f..a3ebb40e 100644
--- a/babel/core.py
+++ b/babel/core.py
@@ -269,7 +269,7 @@ class Locale:
     @classmethod
     def parse(
         cls,
-        identifier: str | Locale | None,
+        identifier: Locale | str | None,
         sep: str = '_',
         resolve_likely_subtags: bool = True,
     ) -> Locale:
diff --git a/babel/messages/catalog.py b/babel/messages/catalog.py
index cff22f9b..1036ab82 100644
--- a/babel/messages/catalog.py
+++ b/babel/messages/catalog.py
@@ -279,7 +279,7 @@ class Catalog:
 
     def __init__(
         self,
-        locale: str | Locale | None = None,
+        locale: Locale | str | None = None,
         domain: str | None = None,
         header_comment: str | None = DEFAULT_HEADER,
         project: str | None = None,
diff --git a/babel/messages/plurals.py b/babel/messages/plurals.py
index 27d81d86..cb1ea5b3 100644
--- a/babel/messages/plurals.py
+++ b/babel/messages/plurals.py
@@ -220,7 +220,7 @@ class _PluralTuple(tuple):
         return self.plural_forms
 
 
-def get_plural(locale: str | None = None) -> _PluralTuple:
+def get_plural(locale: Locale | str | None = None) -> _PluralTuple:
     """A tuple with the information catalogs need to perform proper
     pluralization.  The first item of the tuple is the number of plural
     forms, the second the plural expression.
diff --git a/babel/messages/pofile.py b/babel/messages/pofile.py
index 72170765..a292c8a0 100644
--- a/babel/messages/pofile.py
+++ b/babel/messages/pofile.py
@@ -380,7 +380,7 @@ class PoFileParser:
 
 def read_po(
     fileobj: IO[AnyStr] | Iterable[AnyStr],
-    locale: str | Locale | None = None,
+    locale: Locale | str | None = None,
     domain: str | None = None,
     ignore_obsolete: bool = False,
     charset: str | None = None,
diff --git a/babel/support.py b/babel/support.py
index 7dcda5c6..a4484ce0 100644
--- a/babel/support.py
+++ b/babel/support.py
@@ -642,7 +642,7 @@ class Translations(NullTranslations, gettext.GNUTranslations):
     def load(
         cls,
         dirname: str | os.PathLike[str] | None = None,
-        locales: Iterable[str | Locale] | str | Locale | None = None,
+        locales: Iterable[str | Locale] | Locale | str | None = None,
         domain: str | None = None,
     ) -> NullTranslations:
         """Load translations from the given directory.
@@ -709,7 +709,7 @@ class Translations(NullTranslations, gettext.GNUTranslations):
 
 
 def _locales_to_names(
-    locales: Iterable[str | Locale] | str | Locale | None,
+    locales: Iterable[str | Locale] | Locale | str | None,
 ) -> list[str] | None:
     """Normalize a `locales` argument to a list of locale names.