Merge pull request #178 from zhaoqin-github/1.0

Ensure to input timeout parameter for every rest calls

Author: zhaoqin-github

icontrol/session.py

@@ -492,6 +492,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:
@@ -520,6 +522,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:
@@ -550,6 +554,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:
@@ -582,6 +588,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:
@@ -614,6 +622,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: