summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorCraig Rodrigues <rodrigc@FreeBSD.org>2015-11-13 06:18:22 -0800
committerCraig Rodrigues <rodrigc@FreeBSD.org>2015-11-13 14:23:13 -0800
commit11c327f2d345019ee000cadd53836be655a846be (patch)
tree536c0b5099711681a9c815358f83d3e284960bf4 /contrib
parent704ff438b5aca2fcf26431233bfb3950ce8e677a (diff)
downloadm2crypto-11c327f2d345019ee000cadd53836be655a846be.tar.gz
Fix exception handling syntax for Python 3. [PEP-3110]
This syntax was backported to Python 2.6: https://docs.python.org/2/whatsnew/2.6.html#pep-3110-exception-handling-changes
Diffstat (limited to 'contrib')
-rw-r--r--contrib/smimeplus.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/contrib/smimeplus.py b/contrib/smimeplus.py
index d21a298..57adb50 100644
--- a/contrib/smimeplus.py
+++ b/contrib/smimeplus.py
@@ -94,7 +94,7 @@ class smimeplus(object):
_p7, _data = M2Crypto.SMIME.smime_load_pkcs7_bio(self.__pack(smsg))
try:
return _sender.verify(_p7, _data, flags=M2Crypto.SMIME.PKCS7_SIGNED)
- except M2Crypto.SMIME.SMIME_Error, _msg:
+ except M2Crypto.SMIME.SMIME_Error as _msg:
return None
def encrypt(self, rcert, msg):
@@ -136,7 +136,7 @@ class smimeplus(object):
# Decrypt p7.
try:
return _sender.decrypt(_p7)
- except M2Crypto.SMIME.SMIME_Error, _msg:
+ except M2Crypto.SMIME.SMIME_Error as _msg:
return None
def addHeader(self, rcert, content, subject=''):
@@ -160,14 +160,14 @@ class X509_Subject(UserDict.UserDict):
UserDict.UserDict.__init__(self)
try:
_data = substr.strip().split('/')
- except AttributeError, _msg:
+ except AttributeError as _msg:
pass
else:
for _i in _data:
try:
_k, _v = _i.split('=')
self[_k] = _v
- except ValueError, _msg:
+ except ValueError as _msg:
pass