Added linting

This commit is contained in:
Alysia Broddrick 2023-09-11 05:40:31 -07:00
parent 3be7680311
commit 01335ff515
No known key found for this signature in database
GPG key ID: 03917052CD0F06B7
2 changed files with 16 additions and 20 deletions

View file

@ -176,7 +176,6 @@ class DomainAdmin(ListHeaderAdmin):
readonly_fields = ["state"] readonly_fields = ["state"]
def response_change(self, request, obj): def response_change(self, request, obj):
GET_SECURITY_EMAIL = "_get_security_email" GET_SECURITY_EMAIL = "_get_security_email"
SET_SECURITY_CONTACT = "_set_security_contact" SET_SECURITY_CONTACT = "_set_security_contact"
MAKE_DOMAIN = "_make_domain_in_registry" MAKE_DOMAIN = "_make_domain_in_registry"
@ -187,7 +186,6 @@ class DomainAdmin(ListHeaderAdmin):
REMOVE_CLIENT_HOLD = "_rem_client_hold" REMOVE_CLIENT_HOLD = "_rem_client_hold"
DELETE_DOMAIN = "_delete_domain" DELETE_DOMAIN = "_delete_domain"
PLACE_HOLD = "_place_client_hold" PLACE_HOLD = "_place_client_hold"
EDIT_DOMAIN = "_edit_domain" EDIT_DOMAIN = "_edit_domain"
if PLACE_HOLD in request.POST: if PLACE_HOLD in request.POST:
@ -263,7 +261,6 @@ class DomainAdmin(ListHeaderAdmin):
) )
return HttpResponseRedirect(".") return HttpResponseRedirect(".")
elif MAKE_NAMESERVERS in request.POST: elif MAKE_NAMESERVERS in request.POST:
try: try:
hosts = [("ns1.example.com", None), ("ns2.example.com", None)] hosts = [("ns1.example.com", None), ("ns2.example.com", None)]

View file

@ -228,7 +228,7 @@ class Domain(TimeStampedModel, DomainHelper):
try: try:
hosts = self._get_property("hosts") hosts = self._get_property("hosts")
except Exception as err: except Exception as err:
#Don't throw error as this is normal for a new domain # Don't throw error as this is normal for a new domain
logger.info("Domain is missing nameservers") logger.info("Domain is missing nameservers")
return None return None
@ -282,8 +282,8 @@ class Domain(TimeStampedModel, DomainHelper):
Fully qualified host name, addresses associated with the host Fully qualified host name, addresses associated with the host
example: [(ns1.okay.gov, 127.0.0.1, others ips)]""" example: [(ns1.okay.gov, 127.0.0.1, others ips)]"""
# TODO: ticket #848 finish this implementation # TODO: ticket #848 finish this implementation
#must delete nameservers as well or update # must delete nameservers as well or update
#ip version checking may need to be added in a different ticket # ip version checking may need to be added in a different ticket
if len(hosts) > 13: if len(hosts) > 13:
raise ValueError( raise ValueError(
@ -347,7 +347,6 @@ class Domain(TimeStampedModel, DomainHelper):
# some statuses cannot be set by the client at all # some statuses cannot be set by the client at all
raise NotImplementedError() raise NotImplementedError()
@Cache @Cache
def registrant_contact(self) -> PublicContact: def registrant_contact(self) -> PublicContact:
"""Get or set the registrant for this domain.""" """Get or set the registrant for this domain."""
@ -369,7 +368,6 @@ class Domain(TimeStampedModel, DomainHelper):
@administrative_contact.setter # type: ignore @administrative_contact.setter # type: ignore
def administrative_contact(self, contact: PublicContact): def administrative_contact(self, contact: PublicContact):
logger.info("making admin contact") logger.info("making admin contact")
if contact.contact_type != contact.ContactTypeChoices.ADMINISTRATIVE: if contact.contact_type != contact.ContactTypeChoices.ADMINISTRATIVE:
raise ValueError( raise ValueError(
@ -402,13 +400,15 @@ class Domain(TimeStampedModel, DomainHelper):
logger.error( logger.error(
"Error updating contact, code was %s error was %s" % (e.code, e) "Error updating contact, code was %s error was %s" % (e.code, e)
) )
#TODO - ticket 433 human readable error handling here # TODO - ticket 433 human readable error handling here
def _update_domain_with_contact(self, contact: PublicContact, rem=False): def _update_domain_with_contact(self, contact: PublicContact, rem=False):
# TODO - consider making this use both add and rem at the same time, separating it out may not be needed # TODO - consider making this use both add and rem at the same time, separating it out may not be needed
#good addition for ticket 850 # good addition for ticket 850
logger.info("_update_domain_with_contact() received type %s " % contact.contact_type) logger.info(
"_update_domain_with_contact() received type %s " % contact.contact_type
)
domainContact = epp.DomainContact( domainContact = epp.DomainContact(
contact=contact.registry_id, type=contact.contact_type contact=contact.registry_id, type=contact.contact_type
) )
@ -511,7 +511,7 @@ class Domain(TimeStampedModel, DomainHelper):
) )
# get publicContact objects that have the matching domain and type but a different id # get publicContact objects that have the matching domain and type but a different id
#like in highlander we there can only be one # like in highlander we there can only be one
hasOtherContact = ( hasOtherContact = (
PublicContact.objects.exclude(registry_id=contact.registry_id) PublicContact.objects.exclude(registry_id=contact.registry_id)
.filter(domain=self, contact_type=contact.contact_type) .filter(domain=self, contact_type=contact.contact_type)
@ -522,7 +522,6 @@ class Domain(TimeStampedModel, DomainHelper):
# make contact in registry, duplicate and errors handled there # make contact in registry, duplicate and errors handled there
errorCode = self._make_contact_in_registry(contact) errorCode = self._make_contact_in_registry(contact)
# contact is already added to the domain, but something may have changed on it # contact is already added to the domain, but something may have changed on it
alreadyExistsInRegistry = errorCode == ErrorCode.OBJECT_EXISTS alreadyExistsInRegistry = errorCode == ErrorCode.OBJECT_EXISTS
# if an error occured besides duplication, stop # if an error occured besides duplication, stop
@ -530,7 +529,7 @@ class Domain(TimeStampedModel, DomainHelper):
not alreadyExistsInRegistry not alreadyExistsInRegistry
and errorCode != ErrorCode.COMMAND_COMPLETED_SUCCESSFULLY and errorCode != ErrorCode.COMMAND_COMPLETED_SUCCESSFULLY
): ):
#TODO- ticket #433 look here for error handling # TODO- ticket #433 look here for error handling
raise Exception("Unable to add contact to registry") raise Exception("Unable to add contact to registry")
# contact doesn't exist on the domain yet # contact doesn't exist on the domain yet
@ -828,7 +827,8 @@ class Domain(TimeStampedModel, DomainHelper):
) )
def ready(self): def ready(self):
"""Transition to the ready state """Transition to the ready state
domain should have nameservers and all contacts and now should be considered live on a domain""" domain should have nameservers and all contacts and now should be considered live on a domain
"""
# TODO - in nameservers tickets 848 and 562 check here if updates need to be made # TODO - in nameservers tickets 848 and 562 check here if updates need to be made
nameserverList = self.nameservers nameserverList = self.nameservers
logger.info("Changing to ready state") logger.info("Changing to ready state")
@ -1008,7 +1008,6 @@ class Domain(TimeStampedModel, DomainHelper):
{k: v for k, v in contact.items() if v is not ...} {k: v for k, v in contact.items() if v is not ...}
) )
# get nameserver info, if there are any # get nameserver info, if there are any
if ( if (
# fetch_hosts and # fetch_hosts and