Even more unused variables

This commit is contained in:
Dmitri Bogomolov 2018-03-22 13:48:07 +02:00
parent e43bd36618
commit 6562502416
Signed by untrusted user: g1itch
GPG Key ID: 720A756F18DEED13
2 changed files with 12 additions and 10 deletions

View File

@ -392,9 +392,9 @@ class singleWorker(threading.Thread, StoppableThread):
dataToEncrypt = protocol.getBitfield(myAddress)
try:
privSigningKeyHex, privEncryptionKeyHex, \
pubSigningKey, pubEncryptionKey = self._getKeysForAddress(
myAddress)
# , privEncryptionKeyHex
privSigningKeyHex, _, pubSigningKey, pubEncryptionKey = \
self._getKeysForAddress(myAddress)
except Exception as err:
logger.error(
'Error within sendOutOrStoreMyV4Pubkey. Could not read'
@ -482,9 +482,9 @@ class singleWorker(threading.Thread, StoppableThread):
# We need to convert our private keys to public keys in order
# to include them.
try:
privSigningKeyHex, privEncryptionKeyHex, \
pubSigningKey, pubEncryptionKey = self._getKeysForAddress(
fromaddress)
# , privEncryptionKeyHex
privSigningKeyHex, _, pubSigningKey, pubEncryptionKey = \
self._getKeysForAddress(fromaddress)
except:
queues.UISignalQueue.put((
'updateSentItemStatusByAckdata', (
@ -639,7 +639,8 @@ class singleWorker(threading.Thread, StoppableThread):
for row in queryreturn:
toaddress, fromaddress, subject, message, \
ackdata, status, TTL, retryNumber, encoding = row
toStatus, toAddressVersionNumber, toStreamNumber, toRipe = \
# toStatus
_, toAddressVersionNumber, toStreamNumber, toRipe = \
decodeAddress(toaddress)
# fromStatus, , ,fromRipe
_, fromAddressVersionNumber, fromStreamNumber, _ = \

View File

@ -192,8 +192,8 @@ def reloadBroadcastSendersForWhichImWatching():
logger.debug('reloading subscriptions...')
for row in queryreturn:
address, = row
status, addressVersionNumber, streamNumber, hash = \
decodeAddress(address)
# status
_, addressVersionNumber, streamNumber, hash = decodeAddress(address)
if addressVersionNumber == 2:
broadcastSendersForWhichImWatching[hash] = 0
# Now, for all addresses, even version 2 addresses,
@ -304,7 +304,8 @@ def decryptAndCheckPubkeyPayload(data, address):
particular address.
"""
try:
status, addressVersion, streamNumber, ripe = decodeAddress(address)
# status
_, addressVersion, streamNumber, ripe = decodeAddress(address)
readPosition = 20 # bypass the nonce, time, and object type
embeddedAddressVersion, varintLength = \