zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-08-01 07:26:34 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fixing linter, once more

Browse source
This commit is contained in:
zandercymatics 2023-09-26 11:54:41 -06:00
parent e12598bf20
commit 75913adf29
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/registrar/models/domain.py
View file

@ -725,11 +725,11 @@ class Domain(TimeStampedModel, DomainHelper):
name=postal_info.name or "",
org=postal_info.org,
# For linter - default to "" instead of None
pw=getattr(auth_info, 'pw', ""),
city=getattr(addr, 'city', ""),
pc=getattr(addr, 'pc', ""),
cc=getattr(addr, 'cc', ""),
sp=getattr(addr, 'sp', ""),
pw=getattr(auth_info, "pw", ""),
city=getattr(addr, "city", ""),
pc=getattr(addr, "pc", ""),
cc=getattr(addr, "cc", ""),
sp=getattr(addr, "sp", ""),
**streets,
)
@ -751,7 +751,7 @@ class Domain(TimeStampedModel, DomainHelper):
def generic_contact_getter(
self, contact_type_choice: PublicContact.ContactTypeChoices
) -> PublicContact | None:
) -> PublicContact:
"""Abstracts the cache logic on EppLib contact items
contact_type_choice is a literal in PublicContact.ContactTypeChoices,
@ -773,9 +773,8 @@ class Domain(TimeStampedModel, DomainHelper):
try:
contacts = self._get_property(desired_property)
except KeyError as error:
# Q: Should we be raising an error instead?
logger.error(f"Could not find {contact_type_choice}: {error}")
return None
raise error
else:
# Grab from cache
cached_contact = self.grab_contact_in_keys(contacts, contact_type_choice)