Code quality

Author: PeterSurda

src/bitmessagecli.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 # pylint: disable=too-many-lines,global-statement,too-many-branches,too-many-statements,inconsistent-return-statements
 # pylint: disable=too-many-nested-blocks,too-many-locals,protected-access,too-many-arguments,too-many-function-args
-# pylint: disable=no-member
+# pylint: disable=no-member,superfluous-parens
 """
 Created by Adam Melton (.dok) referenceing https://bitmessage.org/wiki/API_Reference for API documentation
 Distributed under the MIT/X11 software license. See http://www.opensource.org/licenses/mit-license.php.
@@ -16,15 +16,14 @@
 import datetime
 import imghdr
 import json
-import ntpath
 import os
 import socket
 import sys
 import time
-
 from six.moves import input as raw_input
 from six.moves import xmlrpc_client as xmlrpclib
 
+import ntpath
 from bmconfigparser import config
 
 

src/class_addressGenerator.py

@@ -221,8 +221,8 @@ def run(self):
                 ))
 
             elif command in (
-                'createDeterministicAddresses', 'createChan',
-                'getDeterministicAddress', 'joinChan'
+                    'createDeterministicAddresses', 'createChan',
+                    'getDeterministicAddress', 'joinChan'
             ):
                 if not deterministicPassphrase:
                     self.logger.warning(
@@ -268,8 +268,8 @@ def run(self):
                         ripe = highlevelcrypto.to_ripe(
                             potentialPubSigningKey, potentialPubEncryptionKey)
                         if (
-                            ripe[:numberOfNullBytesDemandedOnFrontOfRipeHash]
-                            == b'\x00' * numberOfNullBytesDemandedOnFrontOfRipeHash
+                                ripe[:numberOfNullBytesDemandedOnFrontOfRipeHash]
+                                == b'\x00' * numberOfNullBytesDemandedOnFrontOfRipeHash
                         ):
                             break
 
@@ -303,9 +303,9 @@ def run(self):
                         saveAddressToDisk = False
 
                     if saveAddressToDisk and live and self.save_address(
-                        addressVersionNumber, streamNumber, ripe, label,
-                        potentialPrivSigningKey, potentialPrivEncryptionKey,
-                        nonceTrialsPerByte, payloadLengthExtraBytes
+                            addressVersionNumber, streamNumber, ripe, label,
+                            potentialPrivSigningKey, potentialPrivEncryptionKey,
+                            nonceTrialsPerByte, payloadLengthExtraBytes
                     ):
                         if command in ('createChan', 'joinChan'):
                             config.set(address, 'chan', 'true')
@@ -326,7 +326,7 @@ def run(self):
 
                 # Done generating addresses.
                 if command in (
-                    'createDeterministicAddresses', 'createChan', 'joinChan'
+                        'createDeterministicAddresses', 'createChan', 'joinChan'
                 ):
                     queues.apiAddressGeneratorReturnQueue.put(
                         listOfNewAddressesToSendOutThroughTheAPI)

src/class_objectProcessor.py

@@ -4,6 +4,7 @@
 """
 # pylint: disable=too-many-locals,too-many-return-statements
 # pylint: disable=too-many-branches,too-many-statements
+# pylint: disable=too-many-lines
 import hashlib
 import logging
 import os
@@ -718,10 +719,10 @@ def processmsg(self, data):
         # Don't send ACK if invalid, blacklisted senders, invisible
         # messages, disabled or chan
         if (
-            self.ackDataHasAValidHeader(ackData) and not blockMessage
-            and messageEncodingType != 0
-            and not config.safeGetBoolean(toAddress, 'dontsendack')
-            and not config.safeGetBoolean(toAddress, 'chan')
+                self.ackDataHasAValidHeader(ackData) and not blockMessage
+                and messageEncodingType != 0
+                and not config.safeGetBoolean(toAddress, 'dontsendack')
+                and not config.safeGetBoolean(toAddress, 'chan')
         ):
             ackPayload = ackData[24:]
             objectType, toStreamNumber, expiresTime = \

src/class_singleWorker.py

@@ -772,9 +772,9 @@ def sendMsg(self):
                 if queryreturn != []:
                     # set the status of this msg to doingmsgpow
                     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'
@@ -1082,10 +1082,10 @@ def sendMsg(self):
                                         " more difficult than you are"
                                         " willing to do. %3"
                                     ).arg(str(float(requiredAverageProofOfWorkNonceTrialsPerByte)
-                                          / defaults.networkDefaultProofOfWorkNonceTrialsPerByte)
-                                          ).arg(str(float(requiredPayloadLengthExtraBytes)
-                                                / defaults.networkDefaultPayloadLengthExtraBytes)
-                                                ).arg(l10n.formatTimestamp()))))
+                                              / defaults.networkDefaultProofOfWorkNonceTrialsPerByte)
+                                              ).arg(str(float(requiredPayloadLengthExtraBytes)
+                                                    / defaults.networkDefaultPayloadLengthExtraBytes)
+                                                    ).arg(l10n.formatTimestamp()))))
                             continue
             else:  # if we are sending a message to ourselves or a chan..
                 self.logger.info('Sending a message.')