diff options
| -rw-r--r-- | CHANGES | 3 | ||||
| -rw-r--r-- | redis/__init__.py | 2 | ||||
| -rw-r--r-- | redis/_compat.py | 3 |
3 files changed, 6 insertions, 2 deletions
@@ -1,3 +1,6 @@ +* 3.3.11 + * Further fix for the SSLError -> TimeoutError mapping to work + on obscure releases of Python 2.7. * 3.3.10 * Fixed a potential error handling bug for the SSLError -> TimeoutError mapping introduced in 3.3.9. hanks @zbristow. #1224 diff --git a/redis/__init__.py b/redis/__init__.py index cfe7078..5539ce0 100644 --- a/redis/__init__.py +++ b/redis/__init__.py @@ -29,7 +29,7 @@ def int_or_str(value): return value -__version__ = '3.3.10' +__version__ = '3.3.11' VERSION = tuple(map(int_or_str, __version__.split('.'))) __all__ = [ diff --git a/redis/_compat.py b/redis/_compat.py index 5669454..2a4b2b9 100644 --- a/redis/_compat.py +++ b/redis/_compat.py @@ -98,7 +98,8 @@ if sys.version_info[0] < 3: try: return func(*args, **kwargs) except _SSLError as e: - if any(x in e.message for x in _EXPECTED_SSL_TIMEOUT_MESSAGES): + message = len(e.args) == 1 and unicode(e.args[0]) or '' + if any(x in message for x in _EXPECTED_SSL_TIMEOUT_MESSAGES): # Raise socket.timeout for compatibility with Python 3. raise socket.timeout(*e.args) raise |