pep8, version bump to 2.9.12.9.1

3 files changed, 10 insertions, 6 deletions

diff --git a/CHANGES b/CHANGES
index c0f8aad..ac1bbd0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+* 2.9.1
+    * IPv6 support. Thanks https://github.com/amashinchi
 * 2.9.0
     * Performance improvement for packing commands when using the PythonParser.
       Thanks Guillaume Viot.
diff --git a/redis/__init__.py b/redis/__init__.py
index 1dee2f7..7b616c4 100644
--- a/redis/__init__.py
+++ b/redis/__init__.py
@@ -19,7 +19,7 @@ from redis.exceptions import (
 )
 
 
-__version__ = '2.9.0'
+__version__ = '2.9.1'
 VERSION = tuple(map(int, __version__.split('.')))
 
 __all__ = [
diff --git a/redis/connection.py b/redis/connection.py
index 41c6c96..3b1ab89 100644
--- a/redis/connection.py
+++ b/redis/connection.py
@@ -263,11 +263,13 @@ class Connection(object):
     def _connect(self):
         "Create a TCP socket connection"
         # in 2.6+ try to use IPv6/4 compatibility, else just original code
-        if hasattr(socket,'create_connection'):
-            return socket.create_connection((self.host, self.port), self.socket_timeout)
-        sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        sock.settimeout(self.socket_timeout)
-        sock.connect((self.host, self.port))
+        if hasattr(socket, 'create_connection'):
+            sock = socket.create_connection((self.host, self.port),
+                                            self.socket_timeout)
+        else:
+            sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+            sock.settimeout(self.socket_timeout)
+            sock.connect((self.host, self.port))
         return sock
 
     def _error_message(self, exception):