From 0338aedcc65a3fabeb665f553bcb67a8ffceb3d4 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Wed, 13 Jun 2018 13:35:09 +0200 Subject: [PATCH] Fix bare except statements for expected ImportErrors --- dkim/__init__.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dkim/__init__.py b/dkim/__init__.py index c1dee3e..eeb9fd1 100644 --- a/dkim/__init__.py +++ b/dkim/__init__.py @@ -40,15 +40,15 @@ import time # only needed for arc try: - from authres import AuthenticationResultsHeader -except: - pass + from authres import AuthenticationResultsHeader +except ImportError: + pass # only needed for ed25519 signing/verification try: import nacl.signing import nacl.encoding -except: +except ImportError: pass from dkim.canonicalization import ( @@ -67,10 +67,10 @@ from dkim.crypto import ( UnparsableKeyError, ) try: - from dkim.dnsplug import get_txt -except: - def get_txt(s): - raise RuntimeError("DKIM.verify requires DNS or dnspython module") + from dkim.dnsplug import get_txt +except ImportError: + def get_txt(s): + raise RuntimeError("DKIM.verify requires DNS or dnspython module") from dkim.util import ( get_default_logger, InvalidTagValueList,