diff options
| author | Matěj Cepl <mcepl@cepl.eu> | 2015-11-14 08:37:02 +0000 |
|---|---|---|
| committer | Matěj Cepl <mcepl@cepl.eu> | 2015-11-14 08:37:02 +0000 |
| commit | 5bdfa12acf306824a82fa159e4549621b0c25fa4 (patch) | |
| tree | 7c1a1d297851bbe3b41fe2c3825661b26eb18a59 /contrib | |
| parent | 2faf26de7f8844e493a5dbc48fb1110a2a1d6fe4 (diff) | |
| parent | 11c327f2d345019ee000cadd53836be655a846be (diff) | |
| download | m2crypto-5bdfa12acf306824a82fa159e4549621b0c25fa4.tar.gz | |
Merge branch 'PEP3110' into 'master'
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
See merge request !10
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/smimeplus.py | 8 |
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 |