diff --git a/src/network/bmproto.py b/src/network/bmproto.py index e00d6d0a..837c4ce8 100644 --- a/src/network/bmproto.py +++ b/src/network/bmproto.py @@ -15,7 +15,6 @@ import knownnodes from network.advanceddispatcher import AdvancedDispatcher from network.bmobject import BMObject, BMObjectInsufficientPOWError, BMObjectInvalidDataError, BMObjectExpiredError, BMObjectUnwantedStreamError, BMObjectInvalidError, BMObjectAlreadyHaveError import network.connectionpool -from network.downloadqueue import DownloadQueue from network.node import Node from network.objectracker import ObjectTracker from network.proxy import Proxy, ProxyError, GeneralProxyError diff --git a/src/network/objectracker.py b/src/network/objectracker.py index a7295c21..4541ea76 100644 --- a/src/network/objectracker.py +++ b/src/network/objectracker.py @@ -4,8 +4,6 @@ from threading import RLock from debug import logger from inventory import Inventory -from network.downloadqueue import DownloadQueue -from network.uploadqueue import UploadQueue haveBloom = False diff --git a/src/network/tcp.py b/src/network/tcp.py index 8ef3d1e1..1a4a906c 100644 --- a/src/network/tcp.py +++ b/src/network/tcp.py @@ -17,14 +17,12 @@ from network.advanceddispatcher import AdvancedDispatcher from network.bmproto import BMProtoError, BMProtoInsufficientDataError, BMProtoExcessiveDataError, BMProto from network.bmobject import BMObject, BMObjectInsufficientPOWError, BMObjectInvalidDataError, BMObjectExpiredError, BMObjectUnwantedStreamError, BMObjectInvalidError, BMObjectAlreadyHaveError import network.connectionpool -from network.downloadqueue import DownloadQueue from network.node import Node import network.asyncore_pollchoose as asyncore from network.proxy import Proxy, ProxyError, GeneralProxyError from network.objectracker import ObjectTracker from network.socks5 import Socks5Connection, Socks5Resolver, Socks5AuthError, Socks5Error from network.socks4a import Socks4aConnection, Socks4aResolver, Socks4aError -from network.uploadqueue import UploadQueue, UploadElem, AddrUploadQueue, ObjUploadQueue from network.tls import TLSDispatcher import addresses