Fixed: Codacy issues in src/class_*.py

Author: coffeedogs

PULL_REQUEST_TEMPLATE.md

@@ -5,10 +5,11 @@
 - make the pull request against the ["v0.6" branch](https://github.com/Bitmessage/PyBitmessage/tree/v0.6)
 - it should be possible to do a fast-forward merge of the pull requests
 - PGP-sign the commits included in the pull request
+- try to use a good editor that removes trailing whitespace, highlights potential python issues and uses unix line endings
 - You can get paid for merged commits if you register at [Tip4Commit](https://tip4commit.com/github/Bitmessage/PyBitmessage)
 
 If for some reason you don't want to use github, you can submit the patch using Bitmessage to the "bitmessage" chan, or to one of the developers.
 ## Translations
 
 For helping with translations, please use [Transifex](https://www.transifex.com/bitmessage-project/pybitmessage/). There is no need to submit pull requests for translations.
-For translating technical terms it is recommended to consult the [Microsoft Language Portal](https://www.microsoft.com/Language/en-US/Default.aspx).
+For translating technical terms it is recommended to consult the [Microsoft Language Portal](https://www.microsoft.com/Language/en-US/Default.aspx).

src/class_addressGenerator.py

@@ -230,7 +230,7 @@ def run(self):
                 # need it if we end up passing the info to the API.
                 listOfNewAddressesToSendOutThroughTheAPI = []
 
-                for i in range(numberOfAddressesToMake):
+                for _ in range(numberOfAddressesToMake):
                     # This next section is a little bit strange. We're
                     # going to generate keys over and over until we find
                     # one that has a RIPEMD hash that starts with either

src/class_objectProcessor.py

@@ -20,7 +20,7 @@ def put(self, item, block = True, timeout = None):
     def get(self, block = True, timeout = None):
         try:
             item = Queue.Queue.get(self, block, timeout)
-        except Queue.Empty as e:
+        except Queue.Empty:
             raise Queue.Empty()
         with self.sizeLock:
             self.curSize -= len(item[1])

src/class_objectProcessorQueue.py

@@ -1,23 +1,6 @@
-import gc
-import threading
-import shared
-import time
-import os
-
-import tr#anslate
-from bmconfigparser import BMConfigParser
-from helper_sql import *
-from helper_threading import *
-from inventory import Inventory
-from network.connectionpool import BMConnectionPool
-from debug import logger
-import knownnodes
-import queues
-import state
-
 """
-The singleCleaner class is a timer-driven thread that cleans data structures 
-to free memory, resends messages when a remote node doesn't respond, and 
+The singleCleaner class is a timer-driven thread that cleans data structures
+to free memory, resends messages when a remote node doesn't respond, and
 sends pong messages to keep connections alive if the network isn't busy.
 It cleans these data structures in memory:
 inventory (moves data to the on-disk sql database)
@@ -34,6 +17,23 @@
 
 """
 
+import gc
+import threading
+import shared
+import time
+import os
+
+import tr#anslate
+from bmconfigparser import BMConfigParser
+from helper_sql import *
+from helper_threading import *
+from inventory import Inventory
+from network.connectionpool import BMConnectionPool
+from debug import logger
+import knownnodes
+import queues
+import state
+
 
 class singleCleaner(threading.Thread, StoppableThread):
     cycleLength = 300
@@ -61,7 +61,7 @@ def run(self):
                 'updateStatusBar', 'Doing housekeeping (Flushing inventory in memory to disk...)'))
             Inventory().flush()
             queues.UISignalQueue.put(('updateStatusBar', ''))
-            
+
             # If we are running as a daemon then we are going to fill up the UI
             # queue which will never be handled by a UI. We should clear it to
             # save memory.

src/class_singleCleaner.py

@@ -5,7 +5,7 @@
 import hashlib
 from struct import pack
 # used when the API must execute an outside program
-from subprocess import call
+from subprocess import call  # nosec
 from binascii import hexlify, unhexlify
 
 import tr
@@ -228,7 +228,7 @@ def _doPOWDefaults(self, payload, TTL,
 
     # This function also broadcasts out the pubkey message
     # once it is done with the POW
-    def doPOWForMyV2Pubkey(self, hash):
+    def doPOWForMyV2Pubkey(self, adressHash):
         # Look up my stream number based on my address hash
         """configSections = shared.config.addresses()
         for addressInKeysFile in configSections:
@@ -239,9 +239,9 @@ def doPOWForMyV2Pubkey(self, hash):
                 if hash == hashFromThisParticularAddress:
                     myAddress = addressInKeysFile
                     break"""
-        myAddress = shared.myAddressesByHash[hash]
+        myAddress = shared.myAddressesByHash[adressHash]
         # status
-        _, addressVersionNumber, streamNumber, hash = decodeAddress(myAddress)
+        _, addressVersionNumber, streamNumber, adressHash = decodeAddress(myAddress)
 
         # 28 days from now plus or minus five minutes
         TTL = int(28 * 24 * 60 * 60 + helper_random.randomrandrange(-300, 300))
@@ -293,31 +293,31 @@ def doPOWForMyV2Pubkey(self, hash):
     # does the necessary POW and sends it out. If it *is* a chan then it
     # assembles the pubkey and stores is in the pubkey table so that we can
     # send messages to "ourselves".
-    def sendOutOrStoreMyV3Pubkey(self, hash):
+    def sendOutOrStoreMyV3Pubkey(self, adressHash):
         try:
-            myAddress = shared.myAddressesByHash[hash]
+            myAddress = shared.myAddressesByHash[adressHash]
         except:
             # The address has been deleted.
             return
         if BMConfigParser().safeGetBoolean(myAddress, 'chan'):
             logger.info('This is a chan address. Not sending pubkey.')
             return
-        status, addressVersionNumber, streamNumber, hash = decodeAddress(
+        _, addressVersionNumber, streamNumber, adressHash = decodeAddress(
             myAddress)
 
         # 28 days from now plus or minus five minutes
         TTL = int(28 * 24 * 60 * 60 + helper_random.randomrandrange(-300, 300))
         embeddedTime = int(time.time() + TTL)
+
         # signedTimeForProtocolV2 = embeddedTime - TTL
-        """
-        According to the protocol specification, the expiresTime
-        along with the pubkey information is signed. But to be
-        backwards compatible during the upgrade period, we shall sign
-        not the expiresTime but rather the current time. There must be
-        precisely a 28 day difference between the two. After the upgrade
-        period we'll switch to signing the whole payload with the
-        expiresTime time.
-        """
+        # According to the protocol specification, the expiresTime
+        # along with the pubkey information is signed. But to be
+        # backwards compatible during the upgrade period, we shall sign
+        # not the expiresTime but rather the current time. There must be
+        # precisely a 28 day difference between the two. After the upgrade
+        # period we'll switch to signing the whole payload with the
+        # expiresTime time.
+
         payload = pack('>Q', (embeddedTime))
         payload += '\x00\x00\x00\x01'  # object type: pubkey
         payload += encodeVarint(addressVersionNumber)  # Address version number
@@ -379,7 +379,7 @@ def sendOutOrStoreMyV4Pubkey(self, myAddress):
         if shared.BMConfigParser().safeGetBoolean(myAddress, 'chan'):
             logger.info('This is a chan address. Not sending pubkey.')
             return
-        status, addressVersionNumber, streamNumber, hash = decodeAddress(
+        _, addressVersionNumber, streamNumber, addressHash = decodeAddress(
             myAddress)
 
         # 28 days from now plus or minus five minutes
@@ -419,7 +419,7 @@ def sendOutOrStoreMyV4Pubkey(self, myAddress):
         # when they want to send a message.
         doubleHashOfAddressData = hashlib.sha512(hashlib.sha512(
             encodeVarint(addressVersionNumber) +
-            encodeVarint(streamNumber) + hash
+            encodeVarint(streamNumber) + addressHash
         ).digest()).digest()
         payload += doubleHashOfAddressData[32:]  # the tag
         signature = highlevelcrypto.sign(
@@ -462,6 +462,7 @@ def sendBroadcast(self):
         # Reset just in case
         sqlExecute(
             '''UPDATE sent SET status='broadcastqueued' '''
+
             '''WHERE status = 'doingbroadcastpow' ''')
         queryreturn = sqlQuery(
             '''SELECT fromaddress, subject, message, '''
@@ -848,7 +849,7 @@ def sendMsg(self):
 
                 # to bypass the address version whose length is definitely 1
                 readPosition = 1
-                streamNumber, streamNumberLength = decodeVarint(
+                _, streamNumberLength = decodeVarint(
                     pubkeyPayload[readPosition:readPosition + 10])
                 readPosition += streamNumberLength
                 behaviorBitfield = pubkeyPayload[readPosition:readPosition + 4]
@@ -925,7 +926,7 @@ def sendMsg(self):
                     # regardless of what they say is allowed in order
                     # to get our message to propagate through the network.
                     if requiredAverageProofOfWorkNonceTrialsPerByte < \
-                            defaults.networkDefaultProofOfWorkNonceTrialsPerByte:  
+                            defaults.networkDefaultProofOfWorkNonceTrialsPerByte:
                         requiredAverageProofOfWorkNonceTrialsPerByte = \
                             defaults.networkDefaultProofOfWorkNonceTrialsPerByte
                     if requiredPayloadLengthExtraBytes < \
@@ -1266,7 +1267,7 @@ def sendMsg(self):
                     except:
                         apiNotifyPath = ''
                     if apiNotifyPath != '':
-                        call([apiNotifyPath, "newMessage"])
+                        call([apiNotifyPath, "newMessage"])  # nosec
 
     def requestPubKey(self, toAddress):
         toStatus, addressVersionNumber, streamNumber, ripe = decodeAddress(

src/class_singleWorker.py

@@ -19,7 +19,7 @@ class smtpDeliver(threading.Thread, StoppableThread):
     def __init__(self, parent=None):
         threading.Thread.__init__(self, name="smtpDeliver")
         self.initStop()
-        
+
     def stopThread(self):
         try:
             queues.UISignallerQueue.put(("stopThread", "data"))

src/class_smtpDeliver.py

@@ -6,7 +6,6 @@
 import re
 import signal
 import smtpd
-import socket
 import threading
 import time
 
@@ -16,7 +15,6 @@
 from helper_sql import sqlExecute
 from helper_ackPayload import genAckPayload
 from helper_threading import StoppableThread
-from pyelliptic.openssl import OpenSSL
 import queues
 from version import softwareVersion
 
@@ -68,7 +66,6 @@ def send(self, fromAddress, toAddress, subject, message):
         status, addressVersionNumber, streamNumber, ripe = decodeAddress(toAddress)
         stealthLevel = BMConfigParser().safeGetInt('bitmessagesettings', 'ackstealthlevel')
         ackdata = genAckPayload(streamNumber, stealthLevel)
-        t = ()
         sqlExecute(
             '''INSERT INTO sent VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)''',
             '',
@@ -97,7 +94,7 @@ def decode_header(self, hdr):
                 ret.append(unicode(h[0], h[1]))
             else:
                 ret.append(h[0].decode("utf-8", errors='replace'))
-            
+
         return ret
 
 
@@ -151,7 +148,7 @@ def process_message(self, peer, mailfrom, rcpttos, data):
                     raise Exception("Bad domain %s", domain)
                 logger.debug("Sending %s to %s about %s", sender, rcpt, msg_subject)
                 self.send(sender, rcpt, msg_subject, body)
-                logger.info("Relayed %s to %s", sender, rcpt) 
+                logger.info("Relayed %s to %s", sender, rcpt)
             except Exception as err:
                 logger.error( "Bad to %s: %s", to, repr(err))
                 continue
@@ -162,21 +159,11 @@ def __init__(self, parent=None):
         threading.Thread.__init__(self, name="smtpServerThread")
         self.initStop()
         self.server = smtpServerPyBitmessage(('127.0.0.1', LISTENPORT), None)
-        
+
     def stopThread(self):
         super(smtpServer, self).stopThread()
         self.server.close()
         return
-        s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-#        for ip in ('127.0.0.1', BMConfigParser().get('bitmessagesettings', 'onionbindip')):
-        for ip in ('127.0.0.1'):
-            try:
-                s.connect((ip, LISTENPORT))
-                s.shutdown(socket.SHUT_RDWR)
-                s.close()
-                break
-            except:
-                pass
 
     def run(self):
         asyncore.loop(1)