From 43a63d085fab34f337ceec232e29e5760f4fcc25 Mon Sep 17 00:00:00 2001 From: Kaliko Jack Date: Tue, 6 Feb 2024 18:30:49 +0100 Subject: [PATCH] Fixed ConnectionError argument Timeout does not expose errno, strerror attributes --- musicpd.py | 8 ++++---- test.py | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/musicpd.py b/musicpd.py index d8dc01b..e6b1c05 100644 --- a/musicpd.py +++ b/musicpd.py @@ -648,7 +648,7 @@ class MPDClient: sock.connect(path) sock.settimeout(self.socket_timeout) except socket.error as socket_err: - raise ConnectionError(socket_err.strerror) from socket_err + raise ConnectionError(socket_err) from socket_err return sock def _connect_tcp(self, host, port): @@ -662,7 +662,7 @@ class MPDClient: socket.SOCK_STREAM, socket.IPPROTO_TCP, flags) except socket.error as gaierr: - raise ConnectionError(gaierr.strerror) from gaierr + raise ConnectionError(gaierr) from gaierr for res in gai: af, socktype, proto, _, sa = res sock = None @@ -674,12 +674,12 @@ class MPDClient: sock.settimeout(self.socket_timeout) return sock except socket.error as socket_err: - log.debug('opening socket %s failed: %s}', sa, socket_err) + log.debug('opening socket %s failed: %s', sa, socket_err) err = socket_err if sock is not None: sock.close() if err is not None: - raise ConnectionError(err.strerror) + raise ConnectionError(err) raise ConnectionError("getaddrinfo returns an empty list") def noidle(self): diff --git a/test.py b/test.py index a123b30..299b54a 100755 --- a/test.py +++ b/test.py @@ -633,7 +633,7 @@ class TestConnectionError(unittest.TestCase): cli = musicpd.MPDClient() with self.assertRaises(musicpd.ConnectionError) as cme: cli.connect() - self.assertEqual('err 42', str(cme.exception)) + self.assertEqual('[Errno 42] err 42', str(cme.exception)) def test_non_available_unix_socket(self): delattr(musicpd.socket, 'AF_UNIX') @@ -651,7 +651,7 @@ class TestConnectionError(unittest.TestCase): cli = musicpd.MPDClient() with self.assertRaises(musicpd.ConnectionError) as cme: cli.connect(host=TEST_MPD_HOST) - self.assertEqual('gaierr 42', str(cme.exception)) + self.assertEqual('[Errno 42] gaierr 42', str(cme.exception)) @mock.patch('socket.getaddrinfo') @mock.patch('socket.socket') @@ -665,7 +665,7 @@ class TestConnectionError(unittest.TestCase): cli = musicpd.MPDClient() with self.assertRaises(musicpd.ConnectionError) as cme: cli.connect(host=TEST_MPD_HOST) - self.assertEqual('tcp conn err 42', str(cme.exception)) + self.assertEqual('[Errno 42] tcp conn err 42', str(cme.exception)) @mock.patch('socket.getaddrinfo') def test_connect_tcp_connect_empty_gai(self, gai_mock): -- 2.39.5