diff --git a/CHANGES.md b/CHANGES.md index aaa1388..31f324a 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -65,7 +65,7 @@ * Update soupsieve_py2 backport * Update Tornado_py3 Web Server 6.0.4 (b4e39e5) to 6.1.0 (2047e7a) * Update tmdbsimple 2.2.6 (310d933) to 2.6.6 (679e343) -* Update urllib3 1.25.9 (a5a45dc) to 1.25.11 (5eb604f) +* Update urllib3 1.25.9 (a5a45dc) to 1.25.11 (00f1769) * Change add remove duplicates in newznab provider list based on name and url * Change remove old provider dupe cleanup * Change add response rate limit handling for generic providers @@ -81,6 +81,7 @@ * Update Requests library 2.24.0 (967a05b) to 2.24.0 (2f70990) * Fix update Soupsieve (05086ef) broke MC and TVC browse cards * Update urllib3 1.26.0.dev0 (41eae64) to 1.25.11 (5eb604f) +* Update urllib3 1.25.11 (5eb604f) to 1.25.11 (00f1769) * Change move scantree to sg_helpers to prevent circular reference of it ever again * Update included fallback timezone info file to 2020c * Change use natural time for age if now is night time and the last recent is yesterday evening, otherwise output age as 'yesterday' diff --git a/lib/urllib3/util/ssltransport.py b/lib/urllib3/util/ssltransport.py index d23e518..1e41354 100644 --- a/lib/urllib3/util/ssltransport.py +++ b/lib/urllib3/util/ssltransport.py @@ -42,7 +42,7 @@ class SSLTransport: ) def __init__( - self, socket, ssl_context, suppress_ragged_eofs=True, server_hostname=None + self, socket, ssl_context, server_hostname=None, suppress_ragged_eofs=True ): """ Create an SSLTransport around socket using the provided ssl_context. @@ -184,19 +184,18 @@ class SSLTransport: self.socket._decref_socketios() def _wrap_ssl_read(self, len, buffer=None): - response = None try: - response = self._ssl_io_loop(self.sslobj.read, len, buffer) + return self._ssl_io_loop(self.sslobj.read, len, buffer) except ssl.SSLError as e: if e.errno == ssl.SSL_ERROR_EOF and self.suppress_ragged_eofs: - response = 0 # eof, return 0. + return 0 # eof, return 0. else: raise - return response def _ssl_io_loop(self, func, *args): """ Performs an I/O loop between incoming/outgoing and the socket.""" should_loop = True + ret = None while should_loop: errno = None