Fix Lite API details flag URL and avoid setting unknown values to None

Author: silvanocerza

ipinfo/handler_utils.py

@@ -2,10 +2,10 @@
 Utilities used in handlers.
 """
 
+import copy
 import json
 import os
 import sys
-import copy
 
 from .version import SDK_VERSION
 
@@ -68,21 +68,18 @@ def format_details(
     """
     Format details given a countries object.
     """
-    details["country_name"] = countries.get(details.get("country"))
-    details["isEU"] = details.get("country") in eu_countries
-    details["country_flag_url"] = (
-        COUNTRY_FLAGS_URL + (details.get("country") or "") + ".svg"
-    )
-    details["country_flag"] = copy.deepcopy(
-        countries_flags.get(details.get("country"))
-    )
-    details["country_currency"] = copy.deepcopy(
-        countries_currencies.get(details.get("country"))
-    )
-    details["continent"] = copy.deepcopy(
-        continents.get(details.get("country"))
-    )
-    details["latitude"], details["longitude"] = read_coords(details.get("loc"))
+    country = details.get("country")
+    if country_name := countries.get(country):
+        details["country_name"] = country_name
+    details["isEU"] = country in eu_countries
+    details["country_flag_url"] = COUNTRY_FLAGS_URL + (country or "") + ".svg"
+    details["country_flag"] = copy.deepcopy(countries_flags.get(details.get("country")))
+    if currency := details.get("country"):
+        details["country_currency"] = copy.deepcopy(countries_currencies.get(currency))
+    if continent := continents.get(country):
+        details["continent"] = copy.deepcopy(continent)
+    if location := details.get("loc"):
+        details["latitude"], details["longitude"] = read_coords(location)
 
 
 def read_coords(location):

tests/handler_lite_test.py

@@ -1,6 +1,7 @@
 import os
 
 import pytest
+
 from ipinfo import handler_utils
 from ipinfo.cache.default import DefaultCache
 from ipinfo.details import Details
@@ -42,17 +43,17 @@ def test_get_details():
     assert details.country_code == "US"
     assert details.country == "United States"
     assert details.continent_code == "NA"
-    assert details.continent is None
-    assert details.country_name is None
+    assert not hasattr(details, "continent")
+    assert not hasattr(details, "country_name")
     assert not details.isEU
     assert (
         details.country_flag_url
-        == "https://cdn.ipinfo.io/static/images/countries-flags/United States.svg"
+        == "https://cdn.ipinfo.io/static/images/countries-flags/US.svg"
     )
-    assert details.country_flag is None
-    assert details.country_currency is None
-    assert details.latitude is None
-    assert details.longitude is None
+    assert not hasattr(details, "country_flag")
+    assert not hasattr(details, "country_currency")
+    assert not hasattr(details, "latitude")
+    assert not hasattr(details, "longitude")
 
 
 #############