From c81d9bf66a9321aa1677d4f1a6d4dcd9b50007cd Mon Sep 17 00:00:00 2001 From: Maksym Sobolyev Date: Wed, 10 Jul 2024 15:45:50 -0700 Subject: [PATCH] Fix some pylint warnings. --- sippy/CLIManager.py | 11 ++++++----- sippy/Core/Exceptions.py | 2 +- sippy/Security/SipNonce.py | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/sippy/CLIManager.py b/sippy/CLIManager.py index 563e1b53d..0a4deaae0 100644 --- a/sippy/CLIManager.py +++ b/sippy/CLIManager.py @@ -85,7 +85,7 @@ def run(self): class CLIConnectionManager(object): command_cb = None tcp = False - accept_list = None + accept_list: list = None serversock = None atr = None @@ -120,9 +120,10 @@ def __init__(self, command_cb, address = None, sock_owner = None, backlog = 16, def handle_accept(self, conn, address): #print(self.handle_accept) - if self.tcp and self.accept_list != None and address[0] not in self.accept_list: - conn.close() - return + if self.tcp and self.accept_list is not None: + if address[0] not in self.accept_list: # pylint: disable=unsupported-membership-test + conn.close() + return try: cm = CLIManager(conn, self.command_cb, address) except Exception as e: @@ -274,7 +275,7 @@ def shutdown(self): try: self.clientsock.shutdown(socket.SHUT_RDWR) except Exception as e: - if not isinstance(e, socket.error) or e.errno != ENOTCONN: + if not isinstance(e, socket.error) or e.errno != ENOTCONN: # pylint: disable=no-member dump_exception('self.clientsock.shutdown(socket.SHUT_RDWR)') self.clientsock.close() self.wthr = None diff --git a/sippy/Core/Exceptions.py b/sippy/Core/Exceptions.py index 908f6a7df..6d661e13f 100644 --- a/sippy/Core/Exceptions.py +++ b/sippy/Core/Exceptions.py @@ -34,7 +34,7 @@ class StdException(Exception): def __init__(self, *args): pin_exception(self, 2) - super(self.__class__, self).__init__(*args) + super(StdException, self).__init__(*args) def dump_exception(msg, f = sys.stdout, extra = None): exc_type, exc_value, exc_traceback = sys.exc_info() diff --git a/sippy/Security/SipNonce.py b/sippy/Security/SipNonce.py index 614a56860..0e5695062 100644 --- a/sippy/Security/SipNonce.py +++ b/sippy/Security/SipNonce.py @@ -71,7 +71,7 @@ def decrypt(self, enc): DGST_PRIOS = (DGST_SHA512, DGST_SHA512SESS, DGST_SHA256, DGST_SHA256SESS, DGST_MD5, DGST_MD5SESS) class HashOracle(object): - try: key + try: key # pylint: disable=used-before-assignment except: key = Random.new().read(AES.block_size * 2) ac = None vtime = 32 * 10**9