Merge 21348e7641 into c3e0ca1901

backend/addresses/Addresses.py

@@ -1,5 +1,4 @@
 import warnings
-import pandas as pd
 from typing import Iterator
 from backend.addresses.Address import Address
 from datatypes.epc.property_type_built_form import PropertyType
@@ -122,12 +121,7 @@ class Addresses:
             except (TypeError, ValueError):
                 raise ValueError(f"Invalid UPRN value: {v}")
 
-        uprn_option1 = row.get("uprn")
-        uprn_option1 = uprn_option1 if not pd.isnull(uprn_option1) else None
-        uprn_option2 = row.get("ordnance_survey_uprn")
-        uprn_option2 = uprn_option2 if not pd.isnull(uprn_option2) else None
-
-        uprn = clean_uprn(uprn_option1 or uprn_option2)
+        uprn = clean_uprn(row.get("uprn") or row.get("ordnance_survey_uprn"))
 
         address = row.get("address") or row.get("domna_address_1") or ""
         full_address = row.get("domna_full_address") or address or ""