diff --git a/src/wolfssl/__init__.py b/src/wolfssl/__init__.py index 6e9f96d..3bc71e4 100644 --- a/src/wolfssl/__init__.py +++ b/src/wolfssl/__init__.py @@ -20,6 +20,10 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA +# pylint: disable=too-many-instance-attributes, too-many-arguments +# pylint: disable=too-many-arguments, too-many-branches, too-many-locals +# pylint: disable=too-many-public-methods, too-many-statements + import sys import errno from socket import ( @@ -271,7 +275,8 @@ class SSLSocket(socket): proto=sock.proto, fileno=sock.fileno()) else: - socket.__init__(self, _sock=sock._sock) + socket.__init__( + self, _sock=sock._sock) # pylint: disable=protected-access self.settimeout(sock.gettimeout()) @@ -471,7 +476,7 @@ class SSLSocket(socket): return sock - def do_handshake(self, block=False): + def do_handshake(self, block=False): # pylint: disable=unused-argument """ Perform a TLS/SSL handshake. """ diff --git a/src/wolfssl/_memory.py b/src/wolfssl/_memory.py deleted file mode 100644 index a0840b2..0000000 --- a/src/wolfssl/_memory.py +++ /dev/null @@ -1,35 +0,0 @@ -# -*- coding: utf-8 -*- -# -# _memory.py -# -# Copyright (C) 2006-2017 wolfSSL Inc. -# -# This file is part of wolfSSL. (formerly known as CyaSSL) -# -# wolfSSL is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# wolfSSL is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - -# pylint: disable=missing-docstring - -try: - from wolfssl._ffi import ffi as _ffi - from wolfssl._ffi import lib as _lib -except ImportError: - pass - -_DYNAMIC_TYPE_METHOD = 11 - - -def _native_free(native_object, dynamic_type): - _lib.wolfSSL_Free(native_object, _ffi.NULL, dynamic_type) diff --git a/src/wolfssl/_methods.py b/src/wolfssl/_methods.py index 81ece3f..2c76e3f 100644 --- a/src/wolfssl/_methods.py +++ b/src/wolfssl/_methods.py @@ -23,15 +23,11 @@ # pylint: disable=missing-docstring, invalid-name try: - from wolfssl._ffi import ffi as _ffi from wolfssl._ffi import lib as _lib + from wolfssl._ffi import ffi as _ffi except ImportError: pass -from wolfssl._memory import ( - _native_free, _DYNAMIC_TYPE_METHOD -) - PROTOCOL_SSLv23 = 1 PROTOCOL_SSLv3 = 2 @@ -43,8 +39,14 @@ PROTOCOL_TLSv1_2 = 5 _PROTOCOL_LIST = [PROTOCOL_SSLv23, PROTOCOL_SSLv3, PROTOCOL_TLS, PROTOCOL_TLSv1, PROTOCOL_TLSv1_1, PROTOCOL_TLSv1_2] +_DYNAMIC_TYPE_METHOD = 11 -class WolfSSLMethod(object): + +def _native_free(native_object, dynamic_type): + _lib.wolfSSL_Free(native_object, _ffi.NULL, dynamic_type) + + +class WolfSSLMethod(object): # pylint: disable=too-few-public-methods """ An SSLMethod holds SSL-related configuration options such as protocol version and communication side. diff --git a/tests/test_context.py b/tests/test_context.py index 1a61c9e..cc07a65 100644 --- a/tests/test_context.py +++ b/tests/test_context.py @@ -69,5 +69,5 @@ def test_load_verify_locations_with_cafile(ssl_context): ssl_context.load_verify_locations(cafile="certs/ca-cert.pem") -def test_load_verify_locations_with_cadata(ssl_provider, ssl_context): +def test_load_verify_locations_with_cadata(ssl_context): ssl_context.load_verify_locations(cadata=_CADATA)