More localtime annotations

python-babel · akx · Jan 11, 2023 · Dec 2, 2022 · Dec 4, 2022 · Dec 4, 2022
commit 6c8b3d3d64d6336186dc62c87ca98ce3eda73ada
diff --git a/babel/localtime/_unix.py b/babel/localtime/_unix.py
@@ -3,7 +3,7 @@
 import pytz
 
 
-def _tz_from_env(tzenv):
+def _tz_from_env(tzenv: str) -> pytz.BaseTzInfo:
     if tzenv[0] == ':':
         tzenv = tzenv[1:]
 
@@ -23,7 +23,7 @@ def _tz_from_env(tzenv):
             "Please use a timezone in the form of Continent/City")
 
 
-def _get_localzone(_root='/'):
+def _get_localzone(_root: str = '/') -> pytz.BaseTzInfo:
     """Tries to find the local timezone configuration.
     This method prefers finding the timezone name and passing that to pytz,
     over passing in the localtime file, as in the later case the zoneinfo

diff --git a/babel/localtime/_win32.py b/babel/localtime/_win32.py
@@ -3,16 +3,20 @@
 except ImportError:
     winreg = None
 
-from babel.core import get_global
+from __future__ import annotations
+
+from typing import Dict, cast
+
 import pytz
 
+from babel.core import get_global
 
 # When building the cldr data on windows this module gets imported.
 # Because at that point there is no global.dat yet this call will
 # fail.  We want to catch it down in that case then and just assume
 # the mapping was empty.
 try:
-    tz_names = get_global('windows_zone_mapping')
+    tz_names: dict[str, str] = cast(Dict[str, str], get_global('windows_zone_mapping'))
 except RuntimeError:
     tz_names = {}
 
@@ -27,7 +31,7 @@ def valuestodict(key):
     return dict
 
 
-def get_localzone_name():
+def get_localzone_name() -> str:
     # Windows is special. It has unique time zone names (in several
     # meanings of the word) available, but unfortunately, they can be
     # translated to the language of the operating system, so we need to
@@ -86,7 +90,7 @@ def get_localzone_name():
     return timezone
 
 
-def _get_localzone():
+def _get_localzone() -> pytz.BaseTzInfo:
     if winreg is None:
         raise pytz.UnknownTimeZoneError(
             'Runtime support not available')