AaronFiore/electrum
1
0
Fork 0
Code Activity

interface.run: catch OSError instead of subtypes

Browse Source
This commit is contained in:
SomberNight
2018-09-10 01:09:35 +02:00
parent b2547601a5
commit 6b2509b106
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
electrum/interface.py
View File

@@ -147,7 +147,7 @@ class Interface(PrintError):
async def _try_saving_ssl_cert_for_first_time(self, ca_ssl_context): async def _try_saving_ssl_cert_for_first_time(self, ca_ssl_context):
try: try:
ca_signed = await self.is_server_ca_signed(ca_ssl_context) ca_signed = await self.is_server_ca_signed(ca_ssl_context)
except (ConnectionRefusedError, socket.gaierror, aiorpcx.socks.SOCKSFailure) as e: except (OSError, aiorpcx.socks.SOCKSFailure) as e:
raise ErrorGettingSSLCertFromServer(e) from e raise ErrorGettingSSLCertFromServer(e) from e
if ca_signed: if ca_signed:
with open(self.cert_path, 'w') as f: with open(self.cert_path, 'w') as f:
@@ -211,8 +211,7 @@ class Interface(PrintError):
return return
try: try:
await self.open_session(ssl_context, exit_early=False) await self.open_session(ssl_context, exit_early=False)
except (asyncio.CancelledError, ConnectionRefusedError, socket.gaierror, except (asyncio.CancelledError, OSError, aiorpcx.socks.SOCKSFailure) as e:
ssl.SSLError, TimeoutError, aiorpcx.socks.SOCKSFailure) as e:
self.print_error('disconnecting due to: {}'.format(e)) self.print_error('disconnecting due to: {}'.format(e))
self.exception = e self.exception = e
return return