src/network/bmobject.py

@@ -7,7 +7,7 @@ import time
 import protocol
 import state
 import network.connectionpool  # use long name to address recursive import
-import dandelion
+from network import dandelion
 from highlevelcrypto import calculateInventoryHash
 
 logger = logging.getLogger('default')

src/network/bmproto.py

@@ -17,7 +17,7 @@ from network import knownnodes
 import protocol
 import state
 import network.connectionpool  # use long name to address recursive import
-import dandelion
+from network import dandelion
 from bmconfigparser import config
 from queues import invQueue, objectProcessorQueue, portCheckerQueue
 from randomtrackingdict import RandomTrackingDict

src/network/dandelion.py

@@ -8,7 +8,7 @@ from threading import RLock
 from time import time
 import six
 
-from network import connectionpool
+import network.connectionpool  # use long name to address recursive import
 import state
 from queues import invQueue
 
@@ -185,11 +185,11 @@ class Dandelion:  # pylint: disable=old-style-class
             try:
                 # random two connections
                 self.stem = sample(
-                    sorted(connectionpool.BMConnectionPool(
+                    sorted(network.connectionpool.BMConnectionPool(
                     ).outboundConnections.values()), MAX_STEMS)
             # not enough stems available
             except ValueError:
-                self.stem = connectionpool.BMConnectionPool(
+                self.stem = network.connectionpool.BMConnectionPool(
                 ).outboundConnections.values()
             self.nodeMap = {}
             # hashMap stays to cater for pending stems

src/network/downloadthread.py

@@ -10,7 +10,7 @@ import protocol
 from network import connectionpool
 from .objectracker import missingObjects
 from .threads import StoppableThread
-import dandelion
+from network import dandelion
 
 
 class DownloadThread(StoppableThread):

src/network/invthread.py

@@ -9,7 +9,7 @@ import addresses
 import protocol
 import state
 from network import connectionpool
-import dandelion
+from network import dandelion
 from queues import invQueue
 from .threads import StoppableThread
 

src/network/objectracker.py

@@ -6,7 +6,7 @@ from threading import RLock
 import six
 
 import network.connectionpool  # use long name to address recursive import
-import dandelion
+from network import dandelion
 from randomtrackingdict import RandomTrackingDict
 
 haveBloom = False

src/network/tcp.py

@@ -17,7 +17,7 @@ import l10n
 import protocol
 import state
 import network.connectionpool  # use long name to address recursive import
-import dandelion
+from network import dandelion
 from bmconfigparser import config
 from highlevelcrypto import randomBytes
 from queues import invQueue, receiveDataQueue, UISignalQueue

src/network/uploadthread.py

@@ -7,7 +7,7 @@ import helper_random
 import protocol
 import state
 from network import connectionpool
-import dandelion
+from network import dandelion
 from randomtrackingdict import RandomTrackingDict
 from .threads import StoppableThread