From 6b14f70f26535e8415dd5571217f4213d2bb7eb3 Mon Sep 17 00:00:00 2001 From: Bob Halley Date: Mon, 6 Jul 2020 19:42:51 -0700 Subject: [PATCH] Fix incompatibility in getfqdn() revealed by dnspython web site change. --- dns/resolver.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dns/resolver.py b/dns/resolver.py index 62d01985..ab408727 100644 --- a/dns/resolver.py +++ b/dns/resolver.py @@ -1445,9 +1445,12 @@ def _getfqdn(name=None): if name is None: name = socket.gethostname() try: - return _getnameinfo(_getaddrinfo(name, 80)[0][4])[0] + (name, _, _) = _gethostbyaddr(name) + # Python's version checks aliases too, but our gethostbyname + # ignores them, so we do so here as well. except Exception: - return name + pass + return name def _gethostbyname(name): -- 2.47.3