From a17624931d00f3efaa59fb97d484fe458ce6e616 Mon Sep 17 00:00:00 2001 From: spamdaemon Date: Fri, 21 Apr 2017 13:48:29 -0400 Subject: [PATCH] Fixed a syntax error with python 3.6 This fixes this error: raceback (most recent call last): File "/usr/bin/electrum", line 98, in from electrum import bitcoin, network File "/usr/lib/python3.6/site-packages/electrum/__init__.py", line 2, in from util import format_satoshis, print_msg, print_error, set_verbosity File "/usr/lib/python3.6/site-packages/electrum/util.py", line 537 except socket.error, err: Also, other exceptions in this file use the except X as Y syntax. --- lib/util.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/util.py b/lib/util.py index 2c2201cc..15a8ba49 100644 --- a/lib/util.py +++ b/lib/util.py @@ -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]: