tcosmetic change - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit be6aab538d76191fd849787a58ea40f24c5b7776
DIR parent 5edf41f2e09014666ad70dd0f15faab5bd02e102
HTML Author: ThomasV <thomasv@gitorious>
Date: Sat, 27 Oct 2012 12:31:43 +0200
cosmetic change
Diffstat:
M lib/interface.py | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
---
DIR diff --git a/lib/interface.py b/lib/interface.py
t@@ -256,15 +256,20 @@ class Interface(threading.Thread):
try:
out = ''
while self.is_connected:
+
try:
+ timeout = False
msg = self.s.recv(1024)
except socket.timeout:
- # ping the server with server.version, as a real ping does not exist yet
- self.send([('server.version', [ELECTRUM_VERSION])])
- continue
+ timeout = True
except ssl.SSLError:
+ timeout = True
+
+ if timeout:
+ # ping the server with server.version, as a real ping does not exist yet
self.send([('server.version', [ELECTRUM_VERSION])])
continue
+
out += msg
self.bytes_received += len(msg)
if msg == '':