Improve python3 compatibility of network module

Author: PeterSurda

src/network/bmproto.py

@@ -412,7 +412,7 @@ def bm_command_object(self):
         try:
             self.object.checkObjectByType()
             objectProcessorQueue.put((
-                self.object.objectType, buffer(self.object.data)))  # noqa: F821
+                self.object.objectType, memoryview(self.object.data)))
         except BMObjectInvalidError:
             self.stopDownloadingObject(self.object.inventoryHash, True)
         else:
@@ -428,8 +428,8 @@ def bm_command_object(self):
 
         state.Inventory[self.object.inventoryHash] = (
             self.object.objectType, self.object.streamNumber,
-            buffer(self.payload[objectOffset:]), self.object.expiresTime,  # noqa: F821
-            buffer(self.object.tag)  # noqa: F821
+            memoryview(self.payload[objectOffset:]), self.object.expiresTime,
+            memoryview(self.object.tag)
         )
         self.handleReceivedObject(
             self.object.streamNumber, self.object.inventoryHash)

src/network/connectionpool.py

@@ -73,7 +73,7 @@ def connections(self):
         Shortcut for combined list of connections from
         `inboundConnections` and `outboundConnections` dicts
         """
-        return self.inboundConnections.values() + self.outboundConnections.values()
+        return list(self.inboundConnections.values()) + list(self.outboundConnections.values())
 
     def establishedConnections(self):
         """Shortcut for list of connections having fullyEstablished == True"""
@@ -400,7 +400,7 @@ def loop(self):  # pylint: disable=too-many-branches,too-many-statements
                     i.set_state("close")
         for i in (
             self.connections()
-            + self.listeningSockets.values() + self.udpSockets.values()
+            + list(self.listeningSockets.values()) + list(self.udpSockets.values())
         ):
             if not (i.accepting or i.connecting or i.connected):
                 reaper.append(i)

src/network/dandelion.py

@@ -111,12 +111,12 @@ def maybeAddStem(self, connection, invQueue):
         with self.lock:
             if len(self.stem) < MAX_STEMS:
                 self.stem.append(connection)
-                for k in (k for k, v in self.nodeMap.iteritems() if v is None):
+                for k in (k for k, v in self.nodeMap.items() if v is None):
                     self.nodeMap[k] = connection
                 for k, v in {
-                        k: v for k, v in self.hashMap.iteritems()
+                        k: v for k, v in self.hashMap.items()
                         if v.child is None
-                }.iteritems():
+                }.items():
                     self.hashMap[k] = Stem(
                         connection, v.stream, self.poissonTimeout())
                     invQueue.put((v.stream, k, v.child))
@@ -132,14 +132,14 @@ def maybeRemoveStem(self, connection):
                 self.stem.remove(connection)
                 # active mappings to pointing to the removed node
                 for k in (
-                        k for k, v in self.nodeMap.iteritems()
+                        k for k, v in self.nodeMap.items()
                         if v == connection
                 ):
                     self.nodeMap[k] = None
                 for k, v in {
-                        k: v for k, v in self.hashMap.iteritems()
+                        k: v for k, v in self.hashMap.items()
                         if v.child == connection
-                }.iteritems():
+                }.items():
                     self.hashMap[k] = Stem(
                         None, v.stream, self.poissonTimeout())
 
@@ -180,7 +180,7 @@ def expire(self, invQueue):
         with self.lock:
             deadline = time()
             toDelete = [
-                [v.stream, k, v.child] for k, v in self.hashMap.iteritems()
+                [v.stream, k, v.child] for k, v in self.hashMap.items()
                 if v.timeout < deadline
             ]
 
@@ -199,10 +199,10 @@ def reRandomiseStems(self):
             try:
                 # random two connections
                 self.stem = sample(  # nosec B311
-                    self.pool.outboundConnections.values(), MAX_STEMS)
+                    list(self.pool.outboundConnections.values()), MAX_STEMS)
             # not enough stems available
             except ValueError:
-                self.stem = self.pool.outboundConnections.values()
+                self.stem = list(self.pool.outboundConnections.values())
             self.nodeMap = {}
             # hashMap stays to cater for pending stems
         self.refresh = time() + REASSIGN_INTERVAL

src/network/downloadthread.py

@@ -29,7 +29,7 @@ def cleanPending(self):
         deadline = time.time() - self.requestExpires
         try:
             toDelete = [
-                k for k, v in missingObjects.iteritems()
+                k for k, v in missingObjects.items()
                 if v < deadline]
         except RuntimeError:
             pass

src/network/knownnodes.py

@@ -54,8 +54,8 @@ def json_serialize_knownnodes(output):
     Reorganize knownnodes dict and write it as JSON to output
     """
     _serialized = []
-    for stream, peers in knownNodes.iteritems():
-        for peer, info in peers.iteritems():
+    for stream, peers in knownNodes.items():
+        for peer, info in peers.items():
             info.update(rating=round(info.get('rating', 0), 2))
             _serialized.append({
                 'stream': stream, 'peer': peer._asdict(), 'info': info
@@ -87,7 +87,7 @@ def pickle_deserialize_old_knownnodes(source):
     global knownNodes
     knownNodes = pickle.load(source)  # nosec B301
     for stream in knownNodes.keys():
-        for node, params in knownNodes[stream].iteritems():
+        for node, params in knownNodes[stream].items():
             if isinstance(params, (float, int)):
                 addKnownNode(stream, node, params)
 

src/network/objectracker.py

@@ -74,7 +74,7 @@ def clean(self):
                 with self.objectsNewToThemLock:
                     self.objectsNewToThem = {
                         k: v
-                        for k, v in self.objectsNewToThem.iteritems()
+                        for k, v in self.objectsNewToThem.items()
                         if v >= deadline}
             self.lastCleaned = time.time()
 

src/network/tcp.py

@@ -190,7 +190,7 @@ def sendAddr(self):
                     # only if more recent than 3 hours
                     # and having positive or neutral rating
                     filtered = [
-                        (k, v) for k, v in nodes.iteritems()
+                        (k, v) for k, v in nodes.items()
                         if v["lastseen"] > int(time.time())
                         - maximumAgeOfNodesThatIAdvertiseToOthers
                         and v["rating"] >= 0 and not k.host.endswith('.onion')