From 65625024160de4663c00f8be48589f1e4b6aa1ad Mon Sep 17 00:00:00 2001
From: Dmitri Bogomolov <4glitch@gmail.com>
Date: Thu, 22 Mar 2018 13:48:07 +0200
Subject: [PATCH] Even more unused variables

---
 src/class_singleWorker.py | 15 ++++++++-------
 src/shared.py             |  7 ++++---
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/class_singleWorker.py b/src/class_singleWorker.py
index dd56f810..c95d484a 100644
--- a/src/class_singleWorker.py
+++ b/src/class_singleWorker.py
@@ -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, _ = \
diff --git a/src/shared.py b/src/shared.py
index 37e0e7ee..caf24769 100644
--- a/src/shared.py
+++ b/src/shared.py
@@ -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 = \