Merge pull request #590 from bruceadams/timeout

fix: Default timeout for requests.request()

Author: ehdsouza

watson_developer_cloud/watson_service.py

@@ -446,6 +446,9 @@ def request(self, method, url, accept_json=False, headers=None,
             else:
                 params['api_key'] = self.api_key
 
+        # Use a one minute timeout when our caller doesn't give a timeout.
+        # http://docs.python-requests.org/en/master/user/quickstart/#timeouts
+        kwargs = dict({"timeout": 60}, **kwargs)
         kwargs = dict(kwargs, **self.http_config)
 
         if self.verify is not None: