tMerge pull request #2367 from spamdaemon/patch-1 - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 51b6fa0e4658122bf7777a5df99fea5ec36805ef
DIR parent 6afc11208d49c429ddd6572bfd3d7204f33fe6c8
HTML Author: ThomasV <thomasv@electrum.org>
Date: Sat, 22 Apr 2017 06:59:29 +0200
Merge pull request #2367 from spamdaemon/patch-1
Fixed a syntax error with python 3.6
Diffstat:
M lib/util.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
DIR diff --git a/lib/util.py b/lib/util.py
t@@ -534,7 +534,7 @@ class SocketPipe:
raise timeout
except ssl.SSLError:
raise timeout
- except socket.error, err:
+ except socket.error as err:
if err.errno == 60:
raise timeout
elif err.errno in [11, 35, 10035]: