datamarket 0.9.11__tar.gz → 0.9.13__tar.gz

{datamarket-0.9.11 → datamarket-0.9.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: datamarket
-Version: 0.9.11
+Version: 0.9.13
 Summary: Utilities that integrate advanced scraping knowledge into just one library.
 License: GPL-3.0-or-later
 Author: DataMarket

{datamarket-0.9.11 → datamarket-0.9.13}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "datamarket"
-version = "0.9.11"
+version = "0.9.13"
 description = "Utilities that integrate advanced scraping knowledge into just one library."
 authors = ["DataMarket <techsupport@datamarket.es>"]
 license = "GPL-3.0-or-later"

{datamarket-0.9.11 → datamarket-0.9.13}/src/datamarket/interfaces/alchemy.py

@@ -122,13 +122,11 @@ class AlchemyInterface:
         if not silent:
             logger.info(f"upserting {alchemy_obj}")
 
-        primary_keys = list(
-            column.name for column in alchemy_obj.__table__.primary_key.columns.values()
-        )
+        primary_keys = list(col.name for col in alchemy_obj.__table__.primary_key.columns.values())
         obj_dict = {
-            column.name: getattr(alchemy_obj, column.name)
-            for column in alchemy_obj.__table__.columns
-            if column.name not in primary_keys
+            col.name: val
+            for col in alchemy_obj.__table__.columns
+            if col.name not in primary_keys and (val := getattr(alchemy_obj, col.name)) is not None
         }
 
         statement = (

{datamarket-0.9.11 → datamarket-0.9.13}/src/datamarket/interfaces/nominatim.py

@@ -24,7 +24,7 @@ class GeoNames:
 
         if postcode and len(postcode) == 5 and postcode[:2] in POSTCODES:
             return postcode
-        
+
         if postcode and len(postcode) == 4:
             postcode = f"0{postcode}"
             if postcode[:2] in POSTCODES:
@@ -75,7 +75,7 @@ class Nominatim:
         district, quarter = self.get_district_quarter(raw_json)
         return {
             "country": raw_json.get("country"),
-            "country_code": raw_json.get("country_code") or geoname.get("country_code"),
+            "country_code": (raw_json.get("country_code") or geoname.get("country_code") or "").lower(),
             "state": raw_json.get("state") or geoname.get("community"),
             "province": self.geonames.get_province_from_postcode(postcode),
             "city": city,