Merge branch 'master' of git://github.com/spesmilo/electrum
This commit is contained in:
commit
9d747fb601
|
@ -55,7 +55,6 @@ class TcpInterface(threading.Thread):
|
||||||
threading.Thread.__init__(self)
|
threading.Thread.__init__(self)
|
||||||
self.daemon = True
|
self.daemon = True
|
||||||
self.config = config if config is not None else SimpleConfig()
|
self.config = config if config is not None else SimpleConfig()
|
||||||
self.lock = threading.Lock()
|
|
||||||
self.connected = False
|
self.connected = False
|
||||||
self.debug = False # dump network messages. can be changed at runtime using the console
|
self.debug = False # dump network messages. can be changed at runtime using the console
|
||||||
self.message_id = 0
|
self.message_id = 0
|
||||||
|
@ -83,7 +82,6 @@ class TcpInterface(threading.Thread):
|
||||||
result = response.get('result')
|
result = response.get('result')
|
||||||
|
|
||||||
if msg_id is not None:
|
if msg_id is not None:
|
||||||
with self.lock:
|
|
||||||
method, params, _id, queue = self.unanswered_requests.pop(msg_id)
|
method, params, _id, queue = self.unanswered_requests.pop(msg_id)
|
||||||
if queue is None:
|
if queue is None:
|
||||||
queue = self.response_queue
|
queue = self.response_queue
|
||||||
|
|
Loading…
Reference in New Issue