openstack/python-novaclient
Code Issues Proposed changes

Remove redundant check for version of requests

Browse Source 
Novaclient requirements list contains next entry:
  requests>=2.5.2

so we don't need to check that installed version of requests is greater
than '2.4.1'

Change-Id: I7d270e6d75c76bc56e21f42c683fde9284a8dfd7
This commit is contained in:
Andrey Kurilin 2015-05-15 18:05:14 +03:00
parent 6379287480
commit aa4c947519
1 changed files with 4 additions and 5 deletions

9
novaclient/client.py

@ -61,11 +61,10 @@ DEPRECATED_VERSIONS = {"1.1": "2"}
class TCPKeepAliveAdapter(adapters.HTTPAdapter):
"""The custom adapter used to set TCP Keep-Alive on all connections."""
def init_poolmanager(self, *args, **kwargs):
if requests.__version__ >= '2.4.1':
kwargs.setdefault('socket_options', [
(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1),
(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1),
])
kwargs.setdefault('socket_options', [
(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1),
(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1),
])
super(TCPKeepAliveAdapter, self).init_poolmanager(*args, **kwargs)