From 339034e9ca87b8a92cf9144ba1c452f8036ff94b Mon Sep 17 00:00:00 2001 From: Peter Surda Date: Fri, 29 May 2026 21:49:37 +0800 Subject: [PATCH] Code quality --- src/api.py | 3 ++- src/bitmessageqt/__init__.py | 12 +++++++----- src/network/asyncore_pollchoose.py | 2 +- src/network/tls.py | 1 + src/network/udp.py | 4 +++- src/tests/test_process.py | 1 + tox.ini | 11 +++++++++-- 7 files changed, 24 insertions(+), 10 deletions(-) diff --git a/src/api.py b/src/api.py index 95debcab3d..801187d012 100644 --- a/src/api.py +++ b/src/api.py @@ -153,9 +153,10 @@ class ErrorCodes(type): 28: 'Invalid parameter' } + # pylint: disable=no-member def __new__(mcs, name, bases, namespace): result = super(ErrorCodes, mcs).__new__(mcs, name, bases, namespace) - for code in six.iteritems(mcs._CODES): # pylint: disable=no-member + for code in six.iteritems(mcs._CODES): # beware: the formatting is adjusted for list-table result.__doc__ += """ * - %04i - %s diff --git a/src/bitmessageqt/__init__.py b/src/bitmessageqt/__init__.py index 8f7b5695ec..112fa08c65 100644 --- a/src/bitmessageqt/__init__.py +++ b/src/bitmessageqt/__init__.py @@ -1921,7 +1921,7 @@ def updateSentItemStatusByToAddress(self, toAddress, textToDisplay): sent.item(i, 3).setText(textToDisplay) def updateSentItemStatusByAckdata(self, ackdata, textToDisplay): - if type(ackdata) is str: + if isinstance(ackdata, str): ackdata = QtCore.QByteArray(ackdata) for sent in ( self.ui.tableWidgetInbox, @@ -3193,7 +3193,7 @@ def deleteRowFromMessagelist( self.ui.tableWidgetInboxChans, self.ui.tableWidgetInboxSubscriptions ) - elif type(messageLists) not in (list, tuple): + elif not isinstance(messageLists, (list, tuple)): messageLists = (messageLists,) for messageList in messageLists: if row is not None: @@ -4141,6 +4141,7 @@ def tableWidgetInboxItemClicked(self): except NameError: message = "" except IndexError: + # pylint: disable=redefined-variable-type message = _translate( "MainWindow", "Error occurred: could not load message from disk." @@ -4168,9 +4169,10 @@ def tableWidgetAddressBookItemChanged(self, item): self.rerenderMessagelistFromLabels() self.rerenderMessagelistToLabels() completerList = self.ui.lineEditTo.completer().model().stringList() - for i in range(len(completerList)): - if text_type(completerList[i]).endswith(" <" + item.address + ">"): - completerList[i] = item.label + " <" + item.address + ">" + for index_, string_ in enumerate(completerList): + if text_type(string_).endswith(" <" + item.address + ">"): + completerList[index_] = item.label + " <" \ + + item.address + ">" self.ui.lineEditTo.completer().model().setStringList(completerList) def tabWidgetCurrentChanged(self, n): diff --git a/src/network/asyncore_pollchoose.py b/src/network/asyncore_pollchoose.py index 2a23bb797d..ed7eae7709 100644 --- a/src/network/asyncore_pollchoose.py +++ b/src/network/asyncore_pollchoose.py @@ -478,7 +478,7 @@ def loop(timeout=30.0, use_poll=False, map=None, count=None, poller=None): # then poll poller(subtimeout, map) if isinstance(count, int): - count = count - 1 + count = count - 1 # pylint: disable=redefined-variable-type class dispatcher(object): diff --git a/src/network/tls.py b/src/network/tls.py index a1059d2b6a..b0a200fe0e 100644 --- a/src/network/tls.py +++ b/src/network/tls.py @@ -44,6 +44,7 @@ class TLSDispatcher(AdvancedDispatcher): """TLS functionality for classes derived from AdvancedDispatcher""" # pylint: disable=too-many-instance-attributes,super-init-not-called + # pylint: disable=unused-argument def __init__(self, _=None, sock=None, certfile=None, keyfile=None, server_side=False, ciphers=sslProtocolCiphers): self.want_read = self.want_write = True diff --git a/src/network/udp.py b/src/network/udp.py index 9e8a6aa6e1..2ed410cf1c 100644 --- a/src/network/udp.py +++ b/src/network/udp.py @@ -18,7 +18,9 @@ logger = logging.getLogger('default') -class UDPSocket(BMProto): # pylint: disable=too-many-instance-attributes +# pylint: disable=too-many-instance-attributes +# pylint: disable=no-self-use +class UDPSocket(BMProto): """Bitmessage protocol over UDP (class)""" port = 8444 diff --git a/src/tests/test_process.py b/src/tests/test_process.py index 37b34541b2..77b6c74553 100644 --- a/src/tests/test_process.py +++ b/src/tests/test_process.py @@ -74,6 +74,7 @@ def setUpClass(cls): try: pid = int(cls._get_readline('singleton.lock')) + # pylint: disable=redefined-variable-type cls.process = psutil.Process(pid) time.sleep(5) except (psutil.NoSuchProcess, TypeError): diff --git a/tox.ini b/tox.ini index 7cf892c42a..e2a0a6192b 100644 --- a/tox.ini +++ b/tox.ini @@ -100,7 +100,7 @@ basepython = python2.7 deps = -rrequirements.txt pylint<2.0.0 -commands = pylint --rcfile=tox.ini --exit-zero --ignore=bitmessagekivy pybitmessage +commands = pylint --rcfile=tox.ini --ignore=bitmessagekivy pybitmessage [testenv:py27] sitepackages = true @@ -170,7 +170,14 @@ disable = invalid-name,consider-using-f-string,fixme,raise-missing-from, relative-import,super-with-arguments,unnecessary-pass,unknown-option-value, unspecified-encoding,useless-object-inheritance,useless-option-value, - bad-option-value + bad-option-value,missing-docstring,import-error,wrong-import-order, + inconsistent-return-statements,super-init-not-called,bad-continuation, + no-member,ungrouped-imports,wrong-import-position,len-as-condition, + redefined-argument-from-local,too-few-public-methods, + attribute-defined-outside-init,duplicate-code,too-many-statements, + too-many-locals,too-many-instance-attributes,unneeded-not, + no-else-return,access-member-before-definition, + too-many-public-methods [pylint.design] max-args = 8