From 2eeec91fc19a2e75f9dddd3f99f0cf26af6d7b86 Mon Sep 17 00:00:00 2001 From: "Stuart D. Gathman" Date: Wed, 15 Jun 2011 06:56:45 -0400 Subject: [PATCH] Fix except clauses for py3 --- dkim/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dkim/__init__.py b/dkim/__init__.py index c3d32a0..25177a2 100644 --- a/dkim/__init__.py +++ b/dkim/__init__.py @@ -298,7 +298,7 @@ class DKIM(object): # Currently, we only validate the first DKIM-Signature line found. try: sig = parse_tag_value(sigheaders[0][1]) - except InvalidTagValueList,e: + except InvalidTagValueList as e: raise MessageFormatError(e) sig = parse_tag_value(sigheaders[0][1]) @@ -330,7 +330,7 @@ class DKIM(object): logger.debug("bh: %s" % base64.b64encode(bodyhash)) try: bh = base64.b64decode(re.sub(br"\s+", b"", sig[b'bh'])) - except TypeError,e: + except TypeError as e: raise MessageFormatError(str(e)) if bodyhash != bh: raise ValidationError( @@ -390,7 +390,7 @@ def verify(message, logger=None, dnsfunc=get_txt): d = DKIM(message,logger=logger) try: return d.verify(dnsfunc=dnsfunc) - except DKIMException,x: + except DKIMException as x: if logger is not None: logger.error("%s" % e) return False