Code quality

Author: PeterSurda

src/api.py

@@ -112,40 +112,40 @@ class ErrorCodes(type):
         0: 'Invalid command parameters number',
         1: 'The specified passphrase is blank.',
         2: 'The address version number currently must be 3, 4, or 0'
-        ' (which means auto-select).',
+           ' (which means auto-select).',
         3: 'The stream number must be 1 (or 0 which means'
-        ' auto-select). Others aren\'t supported.',
+           ' auto-select). Others aren\'t supported.',
         4: 'Why would you ask me to generate 0 addresses for you?',
         5: 'You have (accidentally?) specified too many addresses to'
-        ' make. Maximum 999. This check only exists to prevent'
-        ' mischief; if you really want to create more addresses than'
-        ' this, contact the Bitmessage developers and we can modify'
-        ' the check or you can do it yourself by searching the source'
-        ' code for this message.',
+           ' make. Maximum 999. This check only exists to prevent'
+           ' mischief; if you really want to create more addresses than'
+           ' this, contact the Bitmessage developers and we can modify'
+           ' the check or you can do it yourself by searching the source'
+           ' code for this message.',
         6: 'The encoding type must be 2 or 3.',
         7: 'Could not decode address',
         8: 'Checksum failed for address',
         9: 'Invalid characters in address',
         10: 'Address version number too high (or zero)',
         11: 'The address version number currently must be 2, 3 or 4.'
-        ' Others aren\'t supported. Check the address.',
+            ' Others aren\'t supported. Check the address.',
         12: 'The stream number must be 1. Others aren\'t supported.'
-        ' Check the address.',
+            ' Check the address.',
         13: 'Could not find this address in your keys.dat file.',
         14: 'Your fromAddress is disabled. Cannot send.',
         15: 'Invalid ackData object size.',
         16: 'You are already subscribed to that address.',
         17: 'Label is not valid UTF-8 data.',
         18: 'Chan name does not match address.',
         19: 'The length of hash should be 32 bytes (encoded in hex'
-        ' thus 64 characters).',
+            ' thus 64 characters).',
         20: 'Invalid method:',
         21: 'Unexpected API Failure',
         22: 'Decode error',
         23: 'Bool expected in eighteenByteRipe',
         24: 'Chan address is already present.',
         25: 'Specified address is not a chan address.'
-        ' Use deleteAddress API call instead.',
+            ' Use deleteAddress API call instead.',
         26: 'Malformed varint in address: ',
         27: 'Message is too long.',
         28: 'Invalid parameter'
@@ -466,6 +466,7 @@ def APIAuthenticateClient(self):
 class BMRPCDispatcher(object):
     """This class is used to dispatch API commands"""
 
+    # pylint: disable=inconsistent-return-statements
     @staticmethod
     def _decode(text, decode_type):
         try:
@@ -722,8 +723,8 @@ def HandleDeleteWhitelistEntry(self, address):
 
     @command('createRandomAddress')
     def HandleCreateRandomAddress(
-        self, label, eighteenByteRipe=False, totalDifficulty=0,
-        smallMessageDifficulty=0
+            self, label, eighteenByteRipe=False, totalDifficulty=0,
+            smallMessageDifficulty=0
     ):
         """
         Create one address using the random number generator.
@@ -763,9 +764,9 @@ def HandleCreateRandomAddress(
 
     @command('createDeterministicAddresses')
     def HandleCreateDeterministicAddresses(
-        self, passphrase, numberOfAddresses=1, addressVersionNumber=0,
-        streamNumber=0, eighteenByteRipe=False, totalDifficulty=0,
-        smallMessageDifficulty=0
+            self, passphrase, numberOfAddresses=1, addressVersionNumber=0,
+            streamNumber=0, eighteenByteRipe=False, totalDifficulty=0,
+            smallMessageDifficulty=0
     ):
         """
         Create many addresses deterministically using the passphrase.
@@ -1190,8 +1191,8 @@ def HandleTrashSentMessage(self, msgid):
 
     @command('sendMessage')
     def HandleSendMessage(
-        self, toAddress, fromAddress, subject, message,
-        encodingType=2, TTL=4 * 24 * 60 * 60
+            self, toAddress, fromAddress, subject, message,
+            encodingType=2, TTL=4 * 24 * 60 * 60
     ):
         """
         Send the message and return ackdata (hex encoded string).
@@ -1242,7 +1243,7 @@ def HandleSendMessage(
 
     @command('sendBroadcast')
     def HandleSendBroadcast(
-        self, fromAddress, subject, message, encodingType=2,
+            self, fromAddress, subject, message, encodingType=2,
             TTL=4 * 24 * 60 * 60):
         """Send the broadcast message. Similiar to *sendMessage*."""
 
@@ -1361,9 +1362,9 @@ def ListSubscriptions(self):
 
     @command('disseminatePreEncryptedMsg', 'disseminatePreparedObject')
     def HandleDisseminatePreparedObject(
-        self, encryptedPayload,
-        nonceTrialsPerByte=networkDefaultProofOfWorkNonceTrialsPerByte,
-        payloadLengthExtraBytes=networkDefaultPayloadLengthExtraBytes
+            self, encryptedPayload,
+            nonceTrialsPerByte=networkDefaultProofOfWorkNonceTrialsPerByte,
+            payloadLengthExtraBytes=networkDefaultPayloadLengthExtraBytes
     ):
         """
         Handle a request to disseminate an encrypted message.

src/bitmessagemain.py

@@ -11,6 +11,7 @@
 # yet contain logic to expand into further streams.
 
 # flake8: noqa:402
+# pylint: disable=superfluous-parens
 import os
 import sys
 

src/bmconfigparser.py

@@ -128,7 +128,7 @@ def save(self):
             shutil.copyfile(fileName, fileNameBak)
             # The backup succeeded.
             fileNameExisted = True
-        except(IOError, Exception):
+        except (IOError, Exception):
             # The backup failed. This can happen if the file
             # didn't exist before.
             fileNameExisted = False

src/class_addressGenerator.py

@@ -32,10 +32,10 @@ def stopThread(self):
 
         super(addressGenerator, self).stopThread()
 
+    # pylint: disable=too-many-arguments,too-many-positional-arguments
     def save_address(
-        # pylint: disable=too-many-arguments,too-many-positional-arguments
-        self, version, stream, ripe, label, signing_key, encryption_key,
-        nonceTrialsPerByte, payloadLengthExtraBytes
+            self, version, stream, ripe, label, signing_key, encryption_key,
+            nonceTrialsPerByte, payloadLengthExtraBytes
     ):
         """Write essential address config values and reload cryptors"""
         address = encodeAddress(version, stream, ripe)
@@ -183,8 +183,8 @@ def run(self):
                     ripe = highlevelcrypto.to_ripe(
                         pubSigningKey, potentialPubEncryptionKey)
                     if (
-                        ripe[:numberOfNullBytesDemandedOnFrontOfRipeHash]
-                        == b'\x00' * numberOfNullBytesDemandedOnFrontOfRipeHash
+                            ripe[:numberOfNullBytesDemandedOnFrontOfRipeHash]
+                            == b'\x00' * numberOfNullBytesDemandedOnFrontOfRipeHash
                     ):
                         break
                 self.logger.info(

src/class_singleWorker.py

@@ -221,9 +221,9 @@ def _getKeysForAddress(self, address):
 
     @classmethod
     def _doPOWDefaults(
-        cls, payload, TTL,
-        nonceTrialsPerByte=None, payloadLengthExtraBytes=None,
-        log_prefix='', log_time=False
+            cls, payload, TTL,
+            nonceTrialsPerByte=None, payloadLengthExtraBytes=None,
+            log_prefix='', log_time=False
     ):
         if not nonceTrialsPerByte:
             nonceTrialsPerByte = \
@@ -755,9 +755,9 @@ def sendMsg(self):
             # in our keys.dat file.
             elif config.has_section(toaddress):
                 if not sqlExecute(
-                    '''UPDATE sent SET status='doingmsgpow' '''
-                    ''' WHERE toaddress=? AND status='msgqueued' AND folder='sent' ''',
-                    toaddress
+                        '''UPDATE sent SET status='doingmsgpow' '''
+                        ''' WHERE toaddress=? AND status='msgqueued' AND folder='sent' ''',
+                        toaddress
                 ):
                     continue
                 status = 'doingmsgpow'

src/helper_search.py

@@ -8,8 +8,8 @@
 
 
 def search_sql(
-    xAddress='toaddress', account=None, folder='inbox', where=None,
-    what=None, unreadOnly=False
+        xAddress='toaddress', account=None, folder='inbox', where=None,
+        what=None, unreadOnly=False
 ):
     """
     Search for messages from given account and folder having search term
@@ -88,24 +88,24 @@ def check_match(
         return True
 
     if where in (
-        _translate("MainWindow", "To"), _translate("MainWindow", "All")
+            _translate("MainWindow", "To"), _translate("MainWindow", "All")
     ):
         if what.lower() not in toAddress.lower():
             return False
     elif where in (
-        _translate("MainWindow", "From"), _translate("MainWindow", "All")
+            _translate("MainWindow", "From"), _translate("MainWindow", "All")
     ):
         if what.lower() not in fromAddress.lower():
             return False
     elif where in (
-        _translate("MainWindow", "Subject"),
-        _translate("MainWindow", "All")
+            _translate("MainWindow", "Subject"),
+            _translate("MainWindow", "All")
     ):
         if what.lower() not in subject.lower():
             return False
     elif where in (
-        _translate("MainWindow", "Message"),
-        _translate("MainWindow", "All")
+            _translate("MainWindow", "Message"),
+            _translate("MainWindow", "All")
     ):
         if what.lower() not in message.lower():
             return False

src/main-android-live.py

@@ -1,4 +1,5 @@
 """This module is for thread start."""
+# pylint: disable=superfluous-parens
 import state
 import sys
 from bitmessagemain import main

src/network/asyncore_pollchoose.py

@@ -560,12 +560,12 @@ def del_channel(self):
             try:
                 kqueue_poller.pollster.control([select.kevent(
                     fd, select.KQ_FILTER_READ, select.KQ_EV_DELETE)], 0)
-            except(AttributeError, KeyError, TypeError, IOError, OSError):
+            except (AttributeError, KeyError, TypeError, IOError, OSError):
                 pass
             try:
                 kqueue_poller.pollster.control([select.kevent(
                     fd, select.KQ_FILTER_WRITE, select.KQ_EV_DELETE)], 0)
-            except(AttributeError, KeyError, TypeError, IOError, OSError):
+            except (AttributeError, KeyError, TypeError, IOError, OSError):
                 pass
             try:
                 epoll_poller.pollster.unregister(fd)

src/qidenticon.py

@@ -262,9 +262,9 @@ def decode(self, code, twoColor):
         else:
             secondColor = foreColor
 
-        return (middleType, middleInvert, 0),\
-               (cornerType, cornerInvert, cornerTurn),\
-               (sideType, sideInvert, sideTurn),\
+        return (middleType, middleInvert, 0), \
+               (cornerType, cornerInvert, cornerTurn), \
+               (sideType, sideInvert, sideTurn), \
             foreColor, secondColor, swap_cross
 
 

tox.ini

@@ -66,7 +66,7 @@ basepython = python3
 deps =
     pycodestyle
 commands =
-    - pycodestyle --config=tox.ini pybitmessage
+    pycodestyle --config=tox.ini pybitmessage
 
 [testenv:bandit-py27]
 skip_install = true