Merge pull request #179 from zhaoqin-github/v1.3.9-dev

Ensure to input timeout parameter for every rest calls

Author: zhaoqin-github

icontrol/__init__.py

@@ -1 +1 @@
-__version__ = "1.3.9"
+__version__ = "1.3.9.1"

icontrol/session.py

@@ -477,6 +477,8 @@ def delete(self, uri, **kwargs):
         """
         args1 = get_request_args(kwargs)
         args2 = get_send_args(kwargs)
+        if 'timeout' not in args2:
+            args2['timeout'] = self.session.timeout
         req = requests.Request('DELETE', uri, **args1)
         prepared = self.session.prepare_request(req)
         if self.debug:
@@ -505,6 +507,8 @@ def get(self, uri, **kwargs):
         """
         args1 = get_request_args(kwargs)
         args2 = get_send_args(kwargs)
+        if 'timeout' not in args2:
+            args2['timeout'] = self.session.timeout
         req = requests.Request('GET', uri, **args1)
         prepared = self.session.prepare_request(req)
         if self.debug:
@@ -535,6 +539,8 @@ def patch(self, uri, data=None, **kwargs):
         """
         args1 = get_request_args(kwargs)
         args2 = get_send_args(kwargs)
+        if 'timeout' not in args2:
+            args2['timeout'] = self.session.timeout
         req = requests.Request('PATCH', uri, data=data, **args1)
         prepared = self.session.prepare_request(req)
         if self.debug:
@@ -567,6 +573,8 @@ def post(self, uri, data=None, json=None, **kwargs):
         """
         args1 = get_request_args(kwargs)
         args2 = get_send_args(kwargs)
+        if 'timeout' not in args2:
+            args2['timeout'] = self.session.timeout
         req = requests.Request('POST', uri, data=data, json=json, **args1)
         prepared = self.session.prepare_request(req)
         if self.debug:
@@ -599,6 +607,8 @@ def put(self, uri, data=None, **kwargs):
         """
         args1 = get_request_args(kwargs)
         args2 = get_send_args(kwargs)
+        if 'timeout' not in args2:
+            args2['timeout'] = self.session.timeout
         req = requests.Request('PUT', uri, data=data, **args1)
         prepared = self.session.prepare_request(req)
         if self.debug:

requirements.test.txt

@@ -4,7 +4,7 @@
 # Test Requirements
 flake8==2.6.2
 pep8==1.7.0
-pyflakes==1.3.0
+pyflakes==1.2.3
 mccabe==0.5.2
 mock==1.3.0
 pytest==2.9.1