summaryrefslogtreecommitdiff
path: root/redis/connection.py
diff options
context:
space:
mode:
authorAndy McCurdy <andy@andymccurdy.com>2014-01-23 09:01:53 -0800
committerAndy McCurdy <andy@andymccurdy.com>2014-01-23 09:01:53 -0800
commit91a0b8b13b46bd8ea99b61823860ce9c8c3b67f6 (patch)
treebb32d46410c9558d5e2557e97d247acd8708c418 /redis/connection.py
parentc820bd38e4ae0a910fa93f18be39983b3a4231c4 (diff)
downloadredis-py-91a0b8b13b46bd8ea99b61823860ce9c8c3b67f6.tar.gz
pep8, version bump to 2.9.12.9.1
Diffstat (limited to 'redis/connection.py')
-rw-r--r--redis/connection.py12
1 files changed, 7 insertions, 5 deletions
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):