From b0bfc115e7298c25e6b7f2c6abe96001af72ab10 Mon Sep 17 00:00:00 2001
From: Scott Kitterman <scott@kitterman.com>
Date: Sat, 8 Aug 2020 16:53:08 -0400
Subject: [PATCH] Update dnsplug for DNS Python (dns) 2.0 compatibility (LP:
 #1888583)

---
 ChangeLog       | 1 +
 dkim/dnsplug.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 86bbaf7..51e7db3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@ Version 1.1
       verification of multiple signatures in a single message
     - Correct dkim.verify processing to avoid errors when verifying messages
       with no DKIM signatures
+    - Update dnsplug for DNS Python (dns) 2.0 compatibility (LP: #1888583)
 
 2019-12-31 Version 1.0.2
     - dknewkey: On posix operating systems set file permissions to 600 for
diff --git a/dkim/dnsplug.py b/dkim/dnsplug.py
index 1a2e12c..5ccf97c 100644
--- a/dkim/dnsplug.py
+++ b/dkim/dnsplug.py
@@ -31,7 +31,7 @@ def get_txt_dnspython(name, timeout=5):
       a = dns.resolver.query(name, dns.rdatatype.TXT,raise_on_no_answer=False, lifetime=timeout)
       for r in a.response.answer:
           if r.rdtype == dns.rdatatype.TXT:
-              return b"".join(r.items[0].strings)
+              return b"".join(list(r.items)[0].strings)
     except dns.resolver.NXDOMAIN: pass
     return None