Skip to content
This repository was archived by the owner on Oct 23, 2025. It is now read-only.

Commit 8004adc

Browse files
authored
remove dns.resolver import error handling (#469)
1 parent 0d399db commit 8004adc

File tree

2 files changed

+2
-26
lines changed

2 files changed

+2
-26
lines changed

senza/traffic.py

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88

99
import boto3
1010
import click
11-
from clickclick import Action, action, fatal_error, ok, print_table, warning
11+
import dns.resolver
12+
from clickclick import Action, action, ok, print_table, warning
1213

1314
from .aws import StackReference, get_stacks, get_tag
1415
from .manaus import ClientError
@@ -19,12 +20,6 @@
1920
convert_cname_records_to_alias)
2021
from .manaus.utils import extract_client_error_code
2122

22-
try:
23-
import dns.resolver
24-
except ImportError:
25-
fatal_error("Failed to import dns.resolver.\n"
26-
"Run 'pip3 install -U --force-reinstall dnspython'.")
27-
2823
PERCENT_RESOLUTION = 2
2924
FULL_PERCENTAGE = PERCENT_RESOLUTION * 100
3025
DNS_RR_CACHE = {}

tests/test_traffic.py

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -102,22 +102,3 @@ def test_resolve_to_ip_addresses(monkeypatch):
102102
query.side_effect = None
103103
query.return_value = [MagicMock(address='1.2.3.4')]
104104
assert resolve_to_ip_addresses('example.org') == {'1.2.3.4'}
105-
106-
107-
def test_dns_import(monkeypatch):
108-
realimport = builtins.__import__
109-
110-
def fake_import(name: str, *args, **kwargs):
111-
if name == 'dns':
112-
raise ImportError()
113-
else:
114-
m = realimport(name, *args, **kwargs)
115-
return m
116-
117-
monkeypatch.setattr(builtins, '__import__', fake_import)
118-
m_fatal_error = MagicMock()
119-
monkeypatch.setattr('clickclick.fatal_error', m_fatal_error)
120-
importlib.reload(senza.traffic)
121-
m_fatal_error.assert_called_once_with("Failed to import dns.resolver.\n"
122-
"Run 'pip3 install -U "
123-
"--force-reinstall dnspython'.")

0 commit comments

Comments
 (0)