citizenaspirant
/
PyBitmessage
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

More unused variables

This commit is contained in:
Dmitri Bogomolov 2018-03-22 13:23:36 +02:00
parent d91c3a6b0c
commit e43bd36618
Signed by untrusted user: g1itch
GPG Key ID: 720A756F18DEED13
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/class_singleWorker.py
View File

@ -70,7 +70,8 @@ class singleWorker(threading.Thread, StoppableThread):
''' WHERE (status='awaitingpubkey' AND folder='sent')''') ''' WHERE (status='awaitingpubkey' AND folder='sent')''')
for row in queryreturn: for row in queryreturn:
toAddress, = row toAddress, = row
toStatus, toAddressVersionNumber, toStreamNumber, toRipe = \ # toStatus
_, toAddressVersionNumber, toStreamNumber, toRipe = \
decodeAddress(toAddress) decodeAddress(toAddress)
if toAddressVersionNumber <= 3: if toAddressVersionNumber <= 3:
state.neededPubkeys[toAddress] = 0 state.neededPubkeys[toAddress] = 0
@ -239,8 +240,8 @@ class singleWorker(threading.Thread, StoppableThread):
myAddress = addressInKeysFile myAddress = addressInKeysFile
break""" break"""
myAddress = shared.myAddressesByHash[hash] myAddress = shared.myAddressesByHash[hash]
status, addressVersionNumber, streamNumber, hash = decodeAddress( # status
myAddress) _, addressVersionNumber, streamNumber, hash = decodeAddress(myAddress)
# 28 days from now plus or minus five minutes # 28 days from now plus or minus five minutes
TTL = int(28 * 24 * 60 * 60 + helper_random.randomrandrange(-300, 300)) TTL = int(28 * 24 * 60 * 60 + helper_random.randomrandrange(-300, 300))
@ -325,9 +326,9 @@ class singleWorker(threading.Thread, StoppableThread):
payload += protocol.getBitfield(myAddress) payload += protocol.getBitfield(myAddress)
try: try:
privSigningKeyHex, privEncryptionKeyHex, \ # , privEncryptionKeyHex
pubSigningKey, pubEncryptionKey = self._getKeysForAddress( privSigningKeyHex, _, pubSigningKey, pubEncryptionKey = \
myAddress) self._getKeysForAddress(myAddress)
except Exception as err: except Exception as err:
logger.error( logger.error(
'Error within sendOutOrStoreMyV3Pubkey. Could not read' 'Error within sendOutOrStoreMyV3Pubkey. Could not read'
@ -469,7 +470,8 @@ class singleWorker(threading.Thread, StoppableThread):
for row in queryreturn: for row in queryreturn:
fromaddress, subject, body, ackdata, TTL, encoding = row fromaddress, subject, body, ackdata, TTL, encoding = row
status, addressVersionNumber, streamNumber, ripe = \ # status
_, addressVersionNumber, streamNumber, ripe = \
decodeAddress(fromaddress) decodeAddress(fromaddress)
if addressVersionNumber <= 1: if addressVersionNumber <= 1:
logger.error( logger.error(
@ -639,8 +641,9 @@ class singleWorker(threading.Thread, StoppableThread):
ackdata, status, TTL, retryNumber, encoding = row ackdata, status, TTL, retryNumber, encoding = row
toStatus, toAddressVersionNumber, toStreamNumber, toRipe = \ toStatus, toAddressVersionNumber, toStreamNumber, toRipe = \
decodeAddress(toaddress) decodeAddress(toaddress)
fromStatus, fromAddressVersionNumber, fromStreamNumber, \ # fromStatus, , ,fromRipe
fromRipe = decodeAddress(fromaddress) _, fromAddressVersionNumber, fromStreamNumber, _ = \
decodeAddress(fromaddress)
# We may or may not already have the pubkey # We may or may not already have the pubkey
# for this toAddress. Let's check. # for this toAddress. Let's check.

3
src/shared.py
View File

@ -154,7 +154,8 @@ def reloadMyAddressHashes():
isEnabled = BMConfigParser().getboolean(addressInKeysFile, 'enabled') isEnabled = BMConfigParser().getboolean(addressInKeysFile, 'enabled')
if isEnabled: if isEnabled:
hasEnabledKeys = True hasEnabledKeys = True
status, addressVersionNumber, streamNumber, hash = \ # status
_, addressVersionNumber, streamNumber, hash = \
decodeAddress(addressInKeysFile) decodeAddress(addressInKeysFile)
if addressVersionNumber in (2, 3, 4): if addressVersionNumber in (2, 3, 4):
# Returns a simple 32 bytes of information encoded # Returns a simple 32 bytes of information encoded