handle org address the same way

20c · Mar 25, 2024 · b14010d · b14010d
1 parent a4486d2
commit b14010d
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/rdap/objects.py b/rdap/objects.py
@@ -101,6 +101,7 @@ def _parse(self):
         org_name = ""
         org_address = ""
         org_name_final = False
+        org_address_final = False
 
         for ent in self._data.get("entities", []):
             vcard = self._parse_vcard(ent)
@@ -118,8 +119,10 @@ def _parse(self):
                     org_name = vcard["fn"]
                     if "org" in kind:
                         org_name_final = True
-                if "adr" in vcard:
+                if "adr" in vcard and not org_address_final:
                     org_address = vcard["adr"]
+                    if "org" in kind:
+                        org_address_final = True
 
             # check nested entities
             for nent in ent.get("entities", []):