tMerge branch 'master' of git://github.com/spesmilo/electrum - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 9d747fb601c684fb91d489cbf41461775eb8e820
DIR parent 687cc7783f4f2f4165d67f8633146f71466651a3
HTML Author: ThomasV <thomasv@gitorious>
Date: Tue, 5 May 2015 20:52:28 +0200
Merge branch 'master' of git://github.com/spesmilo/electrum
Diffstat:
M lib/interface.py | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
---
DIR diff --git a/lib/interface.py b/lib/interface.py
t@@ -55,7 +55,6 @@ class TcpInterface(threading.Thread):
threading.Thread.__init__(self)
self.daemon = True
self.config = config if config is not None else SimpleConfig()
- self.lock = threading.Lock()
self.connected = False
self.debug = False # dump network messages. can be changed at runtime using the console
self.message_id = 0
t@@ -83,8 +82,7 @@ class TcpInterface(threading.Thread):
result = response.get('result')
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:
queue = self.response_queue
else: