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/bitmessagemain.py

@@ -256,8 +256,8 @@ def start(self):
             while state.shutdown == 0:
                 time.sleep(1)
                 if (
-                    state.testmode
-                    and time.time() - state.last_api_response >= 30
+                        state.testmode
+                        and time.time() - state.last_api_response >= 30
                 ):
                     self.stop()
         elif not state.enableGUI:

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'

src/main.py

@@ -4,13 +4,13 @@
 """Mock kivy app with mock threads."""
 
 import os
-from kivy.config import Config
-from mockbm import multiqueue
-import state
+from kivy.config import Config  # pylint: disable=import-error
 
-from mockbm.class_addressGenerator import FakeAddressGenerator  # noqa:E402
-from bitmessagekivy.mpybit import NavigateApp  # noqa:E402
-from mockbm import network  # noqa:E402
+import pybitmessage.state as state
+from pybitmessage.bitmessagekivy.mpybit import NavigateApp  # noqa:E402
+from pybitmessage.mockbm import multiqueue
+from pybitmessage.mockbm.class_addressGenerator import FakeAddressGenerator  # noqa:E402
+from pybitmessage.mockbm import network  # noqa:E402
 
 stats = network.stats
 objectracker = network.objectracker

src/pathmagic.py

@@ -1,3 +1,6 @@
+"""
+Hack to work around relative imports
+"""
 import os
 import sys
 

src/proofofwork.py

@@ -279,7 +279,9 @@ def buildCPoW():
 
         subprocess.check_call(make_cmd)  # nosec B603
         if os.path.exists(
-            os.path.join(paths.codePath(), 'bitmsghash', 'bitmsghash.so')
+                os.path.join(paths.codePath(),
+                             'bitmsghash',
+                             'bitmsghash.so')
         ):
             init()
     except (OSError, subprocess.CalledProcessError):
@@ -323,14 +325,15 @@ def getTarget(payloadLength, ttl, nonceTrialsPerByte, payloadLengthExtraBytes):
 
 
 def calculate(
-    payload, ttl,
-    nonceTrialsPerByte=networkDefaultProofOfWorkNonceTrialsPerByte,
-    payloadLengthExtraBytes=networkDefaultPayloadLengthExtraBytes
+        payload, ttl,
+        nonceTrialsPerByte=networkDefaultProofOfWorkNonceTrialsPerByte,
+        payloadLengthExtraBytes=networkDefaultPayloadLengthExtraBytes
 ):
     """Do the PoW for the payload and TTL with optional difficulty params"""
     return run(getTarget(
-        len(payload), ttl, nonceTrialsPerByte, payloadLengthExtraBytes),
-        hashlib.sha512(payload).digest())
+                         len(payload), ttl, nonceTrialsPerByte,
+                         payloadLengthExtraBytes),
+               hashlib.sha512(payload).digest())
 
 
 def resetPoW():

tox.ini

@@ -163,7 +163,8 @@ ignore = E722,F841,W503
 disable =
     invalid-name,consider-using-f-string,fixme,raise-missing-from,
     super-with-arguments,unnecessary-pass,unknown-option-value,
-    unspecified-encoding,useless-object-inheritance,useless-option-value
+    unspecified-encoding,useless-object-inheritance,useless-option-value,
+    bad-option-value
 ignore = bitmessagecurses,bitmessagekivy,bitmessageqt,messagetypes,mockbm,
     network,plugins,umsgpack,bitmessagecli.py