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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/class_singleWorker.py
View File

@ -392,9 +392,9 @@ class singleWorker(threading.Thread, StoppableThread):
dataToEncrypt = protocol.getBitfield(myAddress) dataToEncrypt = 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 sendOutOrStoreMyV4Pubkey. Could not read' '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 # We need to convert our private keys to public keys in order
# to include them. # to include them.
try: try:
privSigningKeyHex, privEncryptionKeyHex, \ # , privEncryptionKeyHex
pubSigningKey, pubEncryptionKey = self._getKeysForAddress( privSigningKeyHex, _, pubSigningKey, pubEncryptionKey = \
fromaddress) self._getKeysForAddress(fromaddress)
except: except:
queues.UISignalQueue.put(( queues.UISignalQueue.put((
'updateSentItemStatusByAckdata', ( 'updateSentItemStatusByAckdata', (
@ -639,7 +639,8 @@ class singleWorker(threading.Thread, StoppableThread):
for row in queryreturn: for row in queryreturn:
toaddress, fromaddress, subject, message, \ toaddress, fromaddress, subject, message, \
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, , ,fromRipe # fromStatus, , ,fromRipe
_, fromAddressVersionNumber, fromStreamNumber, _ = \ _, fromAddressVersionNumber, fromStreamNumber, _ = \

7
src/shared.py
View File

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