PEP8 fixes for stp_raet, stp_zmq, INDY-493

stp_raet/rstack.py

@@ -3,7 +3,7 @@
 import time
 from collections import Callable
 from collections import OrderedDict
-from typing import Any, Set
+from typing import Any
 from typing import Dict
 
 from raet.raeting import AutoMode, TrnsKind
@@ -125,7 +125,8 @@ def initLocalKeys(name, baseDir, sigseed, override=False):
         rolePath = os.path.join(baseDir, name, "role", "local", "role.json")
         if os.path.isfile(rolePath):
             if not override:
-                raise FileExistsError("Keys exists for local role {}".format(name))
+                raise FileExistsError(
+                    "Keys exists for local role {}".format(name))
 
         if sigseed and not isinstance(sigseed, bytes):
             sigseed = sigseed.encode()
@@ -134,7 +135,7 @@ def initLocalKeys(name, baseDir, sigseed, override=False):
         keep = RoadKeep(stackname=name, baseroledirpath=baseDir)
         sigkey, verkey = signer.keyhex, signer.verhex
         prikey, pubkey = ed25519SkToCurve25519(sigkey, toHex=True), \
-                         ed25519PkToCurve25519(verkey, toHex=True)
+            ed25519PkToCurve25519(verkey, toHex=True)
         data = OrderedDict([
             ("role", name),
             ("prihex", prikey),
@@ -156,8 +157,12 @@ def initRemoteKeys(name, remoteName, baseDir, verkey, override=False):
         :param override: overwrite the role.remoteName.json file if it already
         exists.
         """
-        rolePath = os.path.join(baseDir, name, "role", "remote", "role.{}.json".
-                                format(remoteName))
+        rolePath = os.path.join(
+            baseDir,
+            name,
+            "role",
+            "remote",
+            "role.{}.json". format(remoteName))
         if os.path.isfile(rolePath):
             if not override:
                 raise FileExistsError("Keys exists for remote role {}".
@@ -218,7 +223,13 @@ def getRemote(self, name: str = None, ha: HA = None):
         return self.findInRemotesByHA(ha) if ha else \
             self.findInRemotesByName(name)
 
-    def connect(self, name=None, remoteId=None, ha=None, verKeyRaw=None, publicKeyRaw=None):
+    def connect(
+            self,
+            name=None,
+            remoteId=None,
+            ha=None,
+            verKeyRaw=None,
+            publicKeyRaw=None):
         """
         Connect to the node specified by name.
 
@@ -232,15 +243,15 @@ def connect(self, name=None, remoteId=None, ha=None, verKeyRaw=None, publicKeyRa
         #                   format(self, name))
         #     return None
         if not remoteId and not ha:
-            raise ValueError('Either Host Address or Remote ID must be provided to connect to a node in Raet stack')
+            raise ValueError(
+                'Either Host Address or Remote ID must be provided to connect to a node in Raet stack')
 
         if remoteId:
             remote = self.remotes[remoteId]
             return self._doConnectRemote(remote, name)
         else:
             return self._doConnectByHA(ha, name)
 
-
     def _doConnectByHA(self, ha, name=None):
         remote = RemoteEstate(stack=self.raetStack,
                               ha=ha)
@@ -417,7 +428,11 @@ def send(self, msg: Any, remoteName: str, ha=None):
 
 
 class SimpleRStack(RStack):
-    def __init__(self, stackParams: Dict, msgHandler: Callable, sighex: str=None):
+    def __init__(
+            self,
+            stackParams: Dict,
+            msgHandler: Callable,
+            sighex: str=None):
         self.stackParams = stackParams
         self.msgHandler = msgHandler
         super().__init__(**stackParams, msgHandler=self.msgHandler, sighex=sighex)
@@ -426,7 +441,6 @@ def start(self):
         super().start()
 
 
-
 class KITRStack(SimpleRStack, KITNetworkInterface):
     # Keep In Touch RStack. RStack which maintains connections mentioned in
     # its registry
@@ -560,16 +574,17 @@ def start(self):
             # (no need to connect to itself)
             del self.registry[self.name]
 
-
     def addRemote(self, remote, dump=False):
         if not self.findInNodeRegByHA(remote.ha):
-            logger.debug('Remote {} with HA {} not added -> not found in registry'.format(remote.name, remote.ha))
+            logger.debug(
+                'Remote {} with HA {} not added -> not found in registry'.format(remote.name, remote.ha))
             return
         return self.raetStack.addRemote(remote, dump)
 
     def createRemote(self, ha):
         if ha and not self.findInNodeRegByHA(ha):
-            logger.debug('Remote with HA {} not added -> not found in registry'.format(ha))
+            logger.debug(
+                'Remote with HA {} not added -> not found in registry'.format(ha))
             return
         return super(KITRStack, self).createRemote(ha)
 
@@ -578,18 +593,18 @@ def processRx(self, packet):
         # of unnecessary JSON files for remotes
         tk = packet.data['tk']
 
-        if tk in [TrnsKind.join]: # join transaction
-            sha = (packet.data['sh'],  packet.data['sp'])
+        if tk in [TrnsKind.join]:  # join transaction
+            sha = (packet.data['sh'], packet.data['sp'])
             if not self.findInNodeRegByHA(sha):
                 return self.handleJoinFromUnregisteredRemote(sha)
 
         return super(KITRStack, self).processRx(packet)
 
     def handleJoinFromUnregisteredRemote(self, sha):
-        logger.debug('Remote with HA {} not added -> not found in registry'.format(sha))
+        logger.debug(
+            'Remote with HA {} not added -> not found in registry'.format(sha))
         return None
 
-
     def connectToMissing(self, currentTime):
         """
         Try to connect to the missing node within the time specified by
@@ -627,7 +642,8 @@ def handleDisconnectedRemote(self, cur, disconn):
         #                  format(self, disconn.uid))
         #     return
 
-        logger.trace("{} handling disconnected remote {}".format(self, disconn))
+        logger.trace(
+            "{} handling disconnected remote {}".format(self, disconn))
 
         if disconn.joinInProcess():
             logger.trace("{} join already in process, so "
@@ -686,8 +702,13 @@ def handleDisconnectedRemote(self, cur, disconn):
         else:
             self.connect(dname, remoteId=disconn.uid)
 
-
-    def connect(self, name=None, remoteId=None, ha=None, verKeyRaw=None, publicKeyRaw=None):
+    def connect(
+            self,
+            name=None,
+            remoteId=None,
+            ha=None,
+            verKeyRaw=None,
+            publicKeyRaw=None):
         """
         Connect to the node specified by name.
 
@@ -708,4 +729,3 @@ def connect(self, name=None, remoteId=None, ha=None, verKeyRaw=None, publicKeyRa
         else:
             ha = self.registry[name]
             return self._doConnectByHA(ha, name)
-

stp_raet/test/conftest.py

@@ -1,9 +1,9 @@
 import asyncio
 
+import pytest
 from stp_core.common.temp_file_util import SafeTemporaryDirectory
 from stp_core.loop.looper import Looper
 from stp_core.network.port_dispenser import genHa
-from stp_core.test.conftest import *
 
 
 @pytest.fixture()
@@ -38,4 +38,4 @@ def tdir(tdirAndLooper):
 
 @pytest.fixture()
 def looper(tdirAndLooper):
-    return tdirAndLooper[1]
+    return tdirAndLooper[1]

stp_raet/test/stack_message_loss.py

@@ -31,8 +31,10 @@ def example2():
 
     print("Finished Handshake\n")
 
-    msg =  {'subject': 'Example message alpha to beta',
-            'content': 'The dict keys in this dict are not special any dict will do.',}
+    msg = {
+        'subject': 'Example message alpha to beta',
+        'content': 'The dict keys in this dict are not special any dict will do.',
+    }
 
     alpha.transmit(msg, remote.uid)
     while True:
@@ -47,8 +49,8 @@ def example2():
     print("{0}\n".format(rx))
     print("Finished Message alpha to beta\n")
 
-    msg =  {'subject': 'Example message beta to alpha',
-            'content': 'Messages are the core of raet.',}
+    msg = {'subject': 'Example message beta to alpha',
+           'content': 'Messages are the core of raet.', }
 
     beta.transmit(msg, remote.uid)
     while True:
@@ -80,4 +82,5 @@ def example2():
 
     print("Finished\n")
 
+
 example2()

stp_raet/test/test_kitrstack.py

@@ -6,13 +6,15 @@
 from stp_raet.rstack import KITRStack
 from stp_core.test.helper import Printer, prepStacks, checkStacksConnected, chkPrinted
 
+
 @pytest.fixture()
 def printers(registry):
     printersDict = {}
     for name, ha in registry.items():
         printersDict[name] = Printer(name)
     return printersDict
 
+
 @pytest.fixture()
 def stacks(registry, tdir, looper, printers):
     rstacks = []
@@ -46,7 +48,5 @@ def testKitRStacksSendMesages(looper, stacks, printers):
 
     stacks[0].send({'greetings': 'hi'}, stacks[1].name)
 
-    looper.run(eventually(chkPrinted, printers[stacks[1].name], {'greetings': 'hi'}))
-
-
-
+    looper.run(eventually(
+        chkPrinted, printers[stacks[1].name], {'greetings': 'hi'}))

stp_raet/test/test_raet_comm_with_one_key.py

@@ -22,14 +22,14 @@ def keysAndNames():
     alphaName = 'alpha'
     betaName = 'beta'
     return alphaSigner.keyhex, alphaPrikey, alphaSigner.verhex, alphaPubkey, \
-           alphaName, betaSigner.keyhex, betaPrikey, betaSigner.verhex, \
-           betaPubkey, betaName
+        alphaName, betaSigner.keyhex, betaPrikey, betaSigner.verhex, \
+        betaPubkey, betaName
 
 
 def testNonPromiscousConnectionWithOneKey(tdir, keysAndNames):
     # Simulating node to node connection
-    alphaSighex, alphaPrikey, alphaVerhex, alphaPubkey,  alphaName, betaSighex,\
-    betaPrikey, betaVerhex, betaPubkey, betaName = keysAndNames
+    alphaSighex, alphaPrikey, alphaVerhex, alphaPubkey, alphaName, betaSighex,\
+        betaPrikey, betaVerhex, betaPubkey, betaName = keysAndNames
     alpha = RoadStack(name=alphaName,
                       ha=genHa(),
                       sigkey=alphaSighex,
@@ -75,7 +75,7 @@ def testNonPromiscousConnectionWithOneKey(tdir, keysAndNames):
 def testPromiscuousConnection(tdir, keysAndNames):
     # Simulating node to client connection
     alphaSighex, alphaPrikey, alphaVerhex, alphaPubkey, alphaName, betaSighex, \
-    betaPrikey, betaVerhex, betaPubkey, betaName = keysAndNames
+        betaPrikey, betaVerhex, betaPubkey, betaName = keysAndNames
     alpha = RoadStack(name=alphaName,
                       ha=genHa(),
                       sigkey=alphaSighex,

stp_raet/test/test_rstack.py

@@ -17,7 +17,7 @@ def test2RStackCommunication(tdir, looper):
         "main": True,
         "mutable": "mutable",
         "messageTimeout": 30,
-        "basedirpath" : tdir
+        "basedirpath": tdir
     }
     stackParamsBeta = {
         "name": names[1],
@@ -26,7 +26,7 @@ def test2RStackCommunication(tdir, looper):
         "auth_mode": AuthMode.ALLOW_ANY.value,
         "mutable": "mutable",
         "messageTimeout": 30,
-        "basedirpath" : tdir
+        "basedirpath": tdir
     }
 
     alpha = SimpleRStack(stackParamsAlpha, msgHandler=alphaP.print)
@@ -45,6 +45,3 @@ def test2RStackCommunication(tdir, looper):
 
     looper.run(eventually(chkPrinted, betaP, {'greetings': 'hi Beta'}))
     looper.run(eventually(chkPrinted, alphaP, {'greetings': 'hi Alpha'}))
-
-
-

stp_raet/util.py

@@ -1,12 +1,9 @@
 import json
 import os
-from collections import OrderedDict
 
 from stp_core.crypto.nacl_wrappers import Signer, Privateer
 from raet.road.keeping import RoadKeep
 
-from stp_core.crypto.util import ed25519SkToCurve25519, ed25519PkToCurve25519
-
 
 def getLocalKeep(name, baseDir=None):
     keep = RoadKeep(stackname=name, baseroledirpath=baseDir)
@@ -73,6 +70,6 @@ def isPortUsedByRaetRemote(keepDir, port):
                                                               'estate.json')))
                 if localRemoteData['ha'][1] == port:
                     return True
-            except:
+            except BaseException:
                 continue
     return False

stp_zmq/kit_zstack.py

@@ -1,6 +1,6 @@
 from stp_core.network.keep_in_touch import KITNetworkInterface
 from stp_zmq.simple_zstack import SimpleZStack
-from typing import Dict, Mapping, Callable, Tuple, Any, Union
+from typing import Dict, Callable
 from stp_core.types import HA
 import time
 from stp_core.common.log import getlogger
@@ -51,10 +51,9 @@ def maintainConnections(self, force=False):
 
     def reconcileNodeReg(self) -> set:
         """
-        Check whether registry contains some addresses 
+        Check whether registry contains some addresses
         that were never connected to
-
-        :return: 
+        :return:
         """
 
         matches = set()
@@ -73,7 +72,7 @@ def retryDisconnected(self, exclude=None):
             if name in exclude or remote.isConnected:
                 continue
 
-            if not name in self._retry_connect:
+            if name not in self._retry_connect:
                 self._retry_connect[name] = 0
 
             if not remote.socket or self._retry_connect[name] >= \

stp_zmq/remote.py

@@ -154,4 +154,4 @@ def _get_monitor_events(socket, non_block=True):
                 events.append(message['event'])
             except zmq.Again:
                 break
-        return events
+        return events

stp_zmq/simple_zstack.py

@@ -1,5 +1,5 @@
 from stp_zmq.zstack import ZStack
-from typing import Dict, Mapping, Callable, Tuple, Any, Union
+from typing import Dict, Callable
 from stp_core.network.auth_mode import AuthMode
 
 

stp_zmq/test/helper.py

@@ -3,8 +3,6 @@
 from distutils.dir_util import copy_tree
 from stat import ST_MODE
 
-from copy import deepcopy
-
 from stp_core.common.util import adict
 from stp_core.loop.eventually import eventually
 from stp_core.network.port_dispenser import genHa
@@ -25,7 +23,6 @@ def genKeys(baseDir, names):
 
 def patch_send_ping_counter(stack):
     stack.ping_count = 0
-    origMethod = stack.sendPingPong
 
 
 def add_counters_to_ping_pong(stack):