diff options
| author | Matěj Cepl <mcepl@cepl.eu> | 2016-07-27 12:37:33 +0200 |
|---|---|---|
| committer | Matěj Cepl <mcepl@cepl.eu> | 2016-12-15 14:46:06 +0100 |
| commit | ba97944ff3811223282e89ddb6468d394ae8659d (patch) | |
| tree | e0c43b85353f0f6e0dcc77345d90f2880e24f67a /contrib | |
| parent | f4979bcdb9ed6b931a83cb916658cc155eb90a5f (diff) | |
| download | m2crypto-ba97944ff3811223282e89ddb6468d394ae8659d.tar.gz | |
Clean up imports and PEP8ization
Using PyCharm "Inspect Code..." functionality I found plenty of
problems.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/dispatcher.py | 1 | ||||
| -rw-r--r-- | contrib/isaac.httpslib.py | 2 | ||||
| -rw-r--r-- | contrib/smimeplus.py | 8 |
3 files changed, 6 insertions, 5 deletions
diff --git a/contrib/dispatcher.py b/contrib/dispatcher.py index b0ee58f..6f3b0e0 100644 --- a/contrib/dispatcher.py +++ b/contrib/dispatcher.py @@ -22,6 +22,7 @@ class NBConnection(SSL.Connection): def connect(self, addr): self._setup_ssl(addr) + # FIXME SSL.Connection doesn't have _check_ssl_return method return self._check_ssl_return(SSL.m2.ssl_connect(self.ssl)) def accept(self, addr): diff --git a/contrib/isaac.httpslib.py b/contrib/isaac.httpslib.py index e09e633..c5474b8 100644 --- a/contrib/isaac.httpslib.py +++ b/contrib/isaac.httpslib.py @@ -6,7 +6,7 @@ Copyright (c) 1999-2002 Ng Pheng Siong. All rights reserved.""" import string -import SSL +from M2Crypto import SSL from httplib import FakeSocket, HTTP, HTTPConnection, HTTPResponse, HTTPS_PORT diff --git a/contrib/smimeplus.py b/contrib/smimeplus.py index 00ab038..9475ab0 100644 --- a/contrib/smimeplus.py +++ b/contrib/smimeplus.py @@ -91,7 +91,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 as _msg: + except M2Crypto.SMIME.SMIME_Error: return None def encrypt(self, rcert, msg): @@ -133,7 +133,7 @@ class smimeplus(object): # Decrypt p7. try: return _sender.decrypt(_p7) - except M2Crypto.SMIME.SMIME_Error as _msg: + except M2Crypto.SMIME.SMIME_Error: return None def addHeader(self, rcert, content, subject=''): @@ -157,14 +157,14 @@ class X509_Subject(UserDict.UserDict): UserDict.UserDict.__init__(self) try: _data = substr.strip().split('/') - except AttributeError as _msg: + except AttributeError: pass else: for _i in _data: try: _k, _v = _i.split('=') self[_k] = _v - except ValueError as _msg: + except ValueError: pass |