From 029fb80dc7e3c49750ff22bc7fe49a54ac25879f Mon Sep 17 00:00:00 2001 From: Gene Shuman Date: Mon, 23 Jan 2017 14:58:55 -0800 Subject: [PATCH] Python 3 fix & arc cmd line tool fix --- arcverify.py | 6 +++--- dkim/dnsplug.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arcverify.py b/arcverify.py index f3bc4d5..3ed3b4f 100644 --- a/arcverify.py +++ b/arcverify.py @@ -40,10 +40,10 @@ message = sys.stdin.read() verbose = '-v' in sys.argv if verbose: logging.basicConfig(level=10) - d = dkim.ARC(message) - cv, results, comment = d.verify() + a = dkim.ARC(message) + cv, results, comment = a.verify() else: - cv, results, comment = arc.verify(message) + cv, results, comment = dkim.arc_verify(message) print("arc verification: cv=%s %s" % (cv, comment)) if verbose: diff --git a/dkim/dnsplug.py b/dkim/dnsplug.py index 8f258b0..3a90ac9 100644 --- a/dkim/dnsplug.py +++ b/dkim/dnsplug.py @@ -80,6 +80,6 @@ def get_txt(name): except UnicodeDecodeError: return None txt = _get_txt(unicode_name) - if txt: + if type(txt) is str: txt = txt.encode('utf-8') return txt