diff --git a/geonamescache/__init__.py b/geonamescache/__init__.py index 20f2a43..6c8b32b 100644 --- a/geonamescache/__init__.py +++ b/geonamescache/__init__.py @@ -24,6 +24,7 @@ ) TDict = TypeVar('TDict', bound=Mapping[str, Any]) +TData = TypeVar('TData') class GeonamesCache: @@ -72,7 +73,7 @@ def get_cities_by_name(self, name: str) -> list[dict[GeoNameIdStr, City]]: self.cities_by_names[name] = [{gid: city} for gid, city in self.cities_items if city['name'] == name] return self.cities_by_names[name] - def get_us_counties(self): + def get_us_counties(self) -> list[USCounty]: return self._load_data(self.us_counties, 'us_counties.json') def search_cities( @@ -105,7 +106,7 @@ def search_cities( return results @staticmethod - def _load_data(datadict: dict[Any, Any] | None, datafile: str) -> dict[Any, Any]: + def _load_data(datadict: TData | None, datafile: str) -> TData: if datadict is None: with open(os.path.join(os.path.dirname(__file__), 'data', datafile)) as f: datadict = json.load(f)