diff --git a/src/epplibwrapper/__init__.py b/src/epplibwrapper/__init__.py index 7defcca31..dd6664a3a 100644 --- a/src/epplibwrapper/__init__.py +++ b/src/epplibwrapper/__init__.py @@ -44,7 +44,6 @@ except NameError: # Attn: these imports should NOT be at the top of the file try: - from .utility.pool import EPPConnectionPool from .client import CLIENT, commands from .errors import RegistryError, ErrorCode from epplib.models import common, info diff --git a/src/registrar/models/domain.py b/src/registrar/models/domain.py index 06b9dce60..319be9fae 100644 --- a/src/registrar/models/domain.py +++ b/src/registrar/models/domain.py @@ -9,17 +9,6 @@ from django_fsm import FSMField, transition, TransitionNotAllowed # type: ignor from django.db import models from typing import Any -from epplibwrapper import ( - - CLIENT as registry, - commands, - common as epp, - extensions, - info as eppInfo, - RegistryError, - ErrorCode, -) - from registrar.utility.errors import ( ActionNotAllowed, @@ -35,8 +24,24 @@ from .utility.domain_helper import DomainHelper from .utility.time_stamped_model import TimeStampedModel from .public_contact import PublicContact - logger = logging.getLogger(__name__) +try: + from epplibwrapper import ( + CLIENT as registry, + commands, + common as epp, + extensions, + info as eppInfo, + RegistryError, + ErrorCode, + ) +except ImportError as err: + logger.error("An import error occured....") + logger.error(err) + raise err + + + class Domain(TimeStampedModel, DomainHelper):