Merge pull request #56 from jaicis/py3quality
quality fixes after inventory issue resolve
This commit is contained in:
commit
8eccbda561
|
@ -1,7 +1,7 @@
|
||||||
"""
|
"""
|
||||||
Thread for performing PoW
|
Thread for performing PoW
|
||||||
"""
|
"""
|
||||||
# pylint: disable=protected-access,too-many-branches,too-many-statements
|
# pylint: disable=protected-access,too-many-branches,too-many-statements,unused-variable
|
||||||
# pylint: disable=no-self-use,too-many-lines,too-many-locals,relative-import
|
# pylint: disable=no-self-use,too-many-lines,too-many-locals,relative-import
|
||||||
|
|
||||||
|
|
||||||
|
@ -477,6 +477,7 @@ class singleWorker(StoppableThread):
|
||||||
|
|
||||||
def sendOnionPeerObj(self, peer=None):
|
def sendOnionPeerObj(self, peer=None):
|
||||||
"""Send onionpeer object representing peer"""
|
"""Send onionpeer object representing peer"""
|
||||||
|
# pylint: disable=redefined-argument-from-local
|
||||||
if not peer: # find own onionhostname
|
if not peer: # find own onionhostname
|
||||||
for peer in state.ownAddresses:
|
for peer in state.ownAddresses:
|
||||||
if peer.host.endswith('.onion'):
|
if peer.host.endswith('.onion'):
|
||||||
|
@ -684,7 +685,7 @@ class singleWorker(StoppableThread):
|
||||||
|
|
||||||
def sendMsg(self):
|
def sendMsg(self):
|
||||||
"""Send a message-type object (assemble the object, perform PoW and put it to the inv announcement queue)"""
|
"""Send a message-type object (assemble the object, perform PoW and put it to the inv announcement queue)"""
|
||||||
# pylint: disable=too-many-nested-blocks
|
# pylint: disable=too-many-nested-blocks,logging-format-interpolation,unused-variable
|
||||||
# Reset just in case
|
# Reset just in case
|
||||||
sqlExecute(
|
sqlExecute(
|
||||||
'''UPDATE sent SET status='msgqueued' '''
|
'''UPDATE sent SET status='msgqueued' '''
|
||||||
|
@ -1238,7 +1239,7 @@ class singleWorker(StoppableThread):
|
||||||
inventoryHash = calculateInventoryHash(encryptedPayload)
|
inventoryHash = calculateInventoryHash(encryptedPayload)
|
||||||
objectType = 2
|
objectType = 2
|
||||||
inventoryHashlist = (
|
inventoryHashlist = (
|
||||||
objectType, toStreamNumber,encryptedPayload, embeddedTime, '')
|
objectType, toStreamNumber, encryptedPayload, embeddedTime, '')
|
||||||
Inventory()[inventoryHash] = (
|
Inventory()[inventoryHash] = (
|
||||||
objectType, toStreamNumber, encryptedPayload, embeddedTime, '')
|
objectType, toStreamNumber, encryptedPayload, embeddedTime, '')
|
||||||
if BMConfigParser().has_section(toaddress) or \
|
if BMConfigParser().has_section(toaddress) or \
|
||||||
|
|
|
@ -43,7 +43,7 @@ class Inventory(object):
|
||||||
|
|
||||||
# on python3 we have separately added __setitem__ method
|
# on python3 we have separately added __setitem__ method
|
||||||
def __setitem__(self, hash_, value):
|
def __setitem__(self, hash_, value):
|
||||||
return getattr(self._realInventory,'__setitem__')(hash_,value)
|
return getattr(self._realInventory, '__setitem__')(hash_, value)
|
||||||
|
|
||||||
# hint for pylint: this is dictionary like object
|
# hint for pylint: this is dictionary like object
|
||||||
def __getitem__(self, key):
|
def __getitem__(self, key):
|
||||||
|
|
Reference in New Issue
Block a user