From 4b67cf4f5376e7d466ade3d9b4f92a7ea7362508 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Sun, 7 Nov 2010 19:38:14 +0100 Subject: [PATCH] [entropy.services.ugc] fix error output, undefined reference --- libraries/entropy/services/ugc/interfaces.py | 22 ++++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/libraries/entropy/services/ugc/interfaces.py b/libraries/entropy/services/ugc/interfaces.py index 4a8485a18..7f296b08e 100644 --- a/libraries/entropy/services/ugc/interfaces.py +++ b/libraries/entropy/services/ugc/interfaces.py @@ -2037,7 +2037,7 @@ class Client: self.sock_conn.settimeout(self.socket_timeout) self.ssl_prepending = True - def print_timeout_err(): + def print_timeout_err(e): if not self.quiet: mytxt = _("connection error while receiving data") self.Output.output( @@ -2163,8 +2163,8 @@ class Client: header = self.output_header ) return None - except self.socket.error: - print_timeout_err() + except self.socket.error as e: + print_timeout_err(e) return None except self.SSL_exceptions['WantX509LookupError']: @@ -2175,22 +2175,22 @@ class Client: const_debug_write(__name__, "WantReadError on receive()") try: self._ssl_poll(select.POLLIN, 'read') - except TimeoutError: - print_timeout_err() + except TimeoutError as e: + print_timeout_err(e) return None - except self.socket.error: - print_timeout_err() + except self.socket.error as e: + print_timeout_err(e) return None - except select.error: - print_timeout_err() + except select.error as e: + print_timeout_err(e) return None except self.SSL_exceptions['WantWriteError']: const_debug_write(__name__, "WantWriteError on receive()") try: self._ssl_poll(select.POLLOUT, 'read') - except TimeoutError: - print_timeout_err() + except TimeoutError as e: + print_timeout_err(e) return None except self.SSL_exceptions['ZeroReturnError']: