support dnspython version 2.0

See also: rthalley/dnspython#473 (comment)
opendns · Oct 26, 2020 · b9c9dde · b9c9dde
1 parent 597cd24
commit b9c9dde
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/doh.py b/doh.py
@@ -10,7 +10,6 @@
 from urllib import request
 
 DEFAULT_SERVER = "https://doh.opendns.com"
-RR_TYPES = dns.rdatatype._by_text.keys()
 
 def usage():
     print("Usage: doh [@[http[s]://]server[:port]] [TYPE] [+nosslverify] domain")
@@ -78,9 +77,12 @@ def main(argv):
                 ssl_ctx.verify_mode = ssl.CERT_NONE
             continue
 
-        if arg.upper() in RR_TYPES:
-            record_type = arg.upper()
-            continue
+        try:
+            if dns.rdatatype.from_text(arg.upper()):
+                record_type = arg.upper()
+                continue
+        except:
+            pass
 
         if record_name == "":
             record_name = arg

diff --git a/requirements.txt b/requirements.txt
@@ -1 +1 @@
-dnspython==1.16.0
+dnspython==2.0.0