hdx-python-country 4.2.0__tar.gz → 4.2.2__tar.gz

{hdx_python_country-4.2.0 → hdx_python_country-4.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: hdx-python-country
-Version: 4.2.0
+Version: 4.2.2
 Summary: HDX Python country code and exchange rate (fx) utilities
 Project-URL: Homepage, https://github.com/OCHA-DAP/hdx-python-country
 Project-URL: Repository, https://github.com/OCHA-DAP/hdx-python-country

{hdx_python_country-4.2.0 → hdx_python_country-4.2.2}/documentation/index.md

@@ -151,7 +151,10 @@ matching. Default is all countries.
 *admin_name_mappings* is a dictionary of mappings from name to pcode. These can
 be global or they can be restricted by country or parent (if the AdminLevel
 object has been set up with parents). Keys take the form "MAPPING",
-"AFG|MAPPING" or "AF01|MAPPING".
+"AFG|MAPPING" or "AF01|MAPPING". A mapping keyed by parent is used even if
+its pcode has a different parent (eg. "ET07|Dawuro": "ET1104" where ET07 is a
+pre-split region). Other mappings are only used with a parent if the pcode's
+parent matches it.
 *admin_name_replacements* is a dictionary of textual replacements to try when
 fuzzy matching. It maps from string to string replacement. The replacements can
 be global or they can be restricted by country or parent (if the AdminLevel

{hdx_python_country-4.2.0 → hdx_python_country-4.2.2}/src/hdx/location/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '4.2.0'
-__version_tuple__ = version_tuple = (4, 2, 0)
+__version__ = version = '4.2.2'
+__version_tuple__ = version_tuple = (4, 2, 2)
 
 __commit_id__ = commit_id = None

{hdx_python_country-4.2.0 → hdx_python_country-4.2.2}/src/hdx/location/adminlevel.py

@@ -751,6 +751,12 @@ class AdminLevel:
             parent = kwargs.get("parent")
         else:
             parent = None
+        if parent:
+            # A parent-keyed mapping is trusted even if its p-code has a
+            # different parent eg. a pre-split region name
+            pcode = self._admin_name_mappings.get(f"{parent}|{name}")
+            if pcode and self.pcode_to_iso3[pcode] == countryiso3:
+                return pcode, True
         pcode = self.get_name_mapped_pcode(countryiso3, name, parent)
         if pcode and self.pcode_to_iso3[pcode] == countryiso3:
             if parent:

{hdx_python_country-4.2.0 → hdx_python_country-4.2.2}/src/hdx/location/country.py

@@ -5,6 +5,7 @@ import os.path
 import re
 from collections.abc import Iterator
 from pathlib import Path
+from typing import Any
 
 from hdx.utilities.base_downloader import BaseDownload, DownloadError
 from hdx.utilities.downloader import Download
@@ -235,7 +236,7 @@ class Country:
         country_name_overrides: dict | None = None,
         country_name_mappings: dict | None = None,
         downloader: BaseDownload | None = None,
-    ) -> list[dict[str, dict]]:
+    ) -> dict[str, dict[str, Any]]:
         """
         Read countries data from OCHA countries feed (falling back to file).
         include_unofficial, use_live, country_name_overrides and country_name_mappings
@@ -250,7 +251,7 @@ class Country:
             downloader: Download or Retrieve object. Defaults to None.
 
         Returns:
-            Countries dictionaries
+            Dictionary of countries data lookups (countries, iso2iso3, m49iso3 etc.)
         """
         if include_unofficial is not None:
             cls._include_unofficial = include_unofficial

{hdx_python_country-4.2.0 → hdx_python_country-4.2.2}/tests/fixtures/adminlevelparent.yaml

@@ -14,6 +14,7 @@ admin_name_mappings:
   "MyMapping": "AF0301"
   "AFG|MyMapping2": "AF0401"
   "AF05|MyMapping3": "AF0501"
+  "AF05|MyMapping4": "AF0401"
 
 admin_name_replacements:
   "qx": ""

{hdx_python_country-4.2.0 → hdx_python_country-4.2.2}/tests/hdx/location/test_adminlevel.py

@@ -340,6 +340,7 @@ class TestAdminLevel:
             "MyMapping: Charikar (AF0301)",
             "AFG|MyMapping2: Maydan Shahr (AF0401)",
             "AF05|MyMapping3: Pul-e-Alam (AF0501)",
+            "AF05|MyMapping4: Maydan Shahr (AF0401)",
         ]
         assert admintwo.get_pcode("AFG", "MyMapping", logname="test") == (
             "AF0301",
@@ -374,6 +375,13 @@ class TestAdminLevel:
             "AFG", "MyMapping3", parent="AF04", logname="test"
         ) == (None, False)
 
+        assert admintwo.get_pcode(
+            "AFG", "MyMapping4", parent="AF05", logname="test"
+        ) == ("AF0401", True)
+        assert admintwo.get_pcode(
+            "AFG", "MyMapping4", parent="AF04", logname="test"
+        ) == (None, False)
+
         # Names are garbled so that only the "qx" replacement, not fuzzy
         # matching, can resolve them. That tests replacement scoping whatever
         # the matcher.