diff options
| author | Richard Mitchell <richard.j.mitchell@gmail.com> | 2014-04-29 14:55:26 +0100 |
|---|---|---|
| committer | Dwayne Litzenberger <dlitz@dlitz.net> | 2014-06-22 20:16:05 -0700 |
| commit | 9e171b794f102f5745076051202997df9eac254a (patch) | |
| tree | 905358f99a2bb285083f1cf821abfc806b629349 | |
| parent | de67e51324fc7ecfb553046938b2f734e48ce9e7 (diff) | |
| download | pycrypto-9e171b794f102f5745076051202997df9eac254a.tar.gz | |
Get rid of catch-all exceptions. LP#1178485.
| -rw-r--r-- | lib/Crypto/SelfTest/Signature/test_pkcs1_15.py | 4 | ||||
| -rw-r--r-- | lib/Crypto/Util/py3compat.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/Crypto/SelfTest/Signature/test_pkcs1_15.py b/lib/Crypto/SelfTest/Signature/test_pkcs1_15.py index cc94262..c2d60f8 100644 --- a/lib/Crypto/SelfTest/Signature/test_pkcs1_15.py +++ b/lib/Crypto/SelfTest/Signature/test_pkcs1_15.py @@ -165,7 +165,7 @@ class PKCS1_15_Tests(unittest.TestCase): # Data to sign can either be in hex form or not try: h.update(t2b(row[1])) - except: + except ValueError: h.update(b(row[1])) # The real test signer = PKCS.new(key) @@ -186,7 +186,7 @@ class PKCS1_15_Tests(unittest.TestCase): # Data to sign can either be in hex form or not try: h.update(t2b(row[1])) - except: + except ValueError: h.update(b(row[1])) # The real test verifier = PKCS.new(key) diff --git a/lib/Crypto/Util/py3compat.py b/lib/Crypto/Util/py3compat.py index b8b89bf..1ab2206 100644 --- a/lib/Crypto/Util/py3compat.py +++ b/lib/Crypto/Util/py3compat.py @@ -75,7 +75,7 @@ if sys.version_info[0] == 2: def tobytes(s): try: return s.encode('latin-1') - except: + except UnicodeError: return ''.join(s) def tostr(bs): return unicode(bs, 'latin-1') |