Merge pull request #12 from holm/master

Support setting timeout of connection

Author: screeley

embedly/client.py

@@ -22,7 +22,7 @@ class Embedly(object):
     Client
 
     """
-    def __init__(self, key=None, user_agent=USER_AGENT):
+    def __init__(self, key=None, user_agent=USER_AGENT, timeout=60):
         """
         Initialize the Embedly client
 
@@ -34,6 +34,7 @@ def __init__(self, key=None, user_agent=USER_AGENT):
         :returns: None
         """
         self.user_agent = user_agent
+        self.timeout = timeout
         self.key = key
         self.services = []
 
@@ -49,7 +50,7 @@ def get_services(self):
 
         url = 'http://api.embed.ly/1/services/python'
 
-        http = httplib2.Http()
+        http = httplib2.Http(timeout=self.timeout)
         headers = {'User-Agent' : self.user_agent}
         resp, content = http.request(url, headers=headers)
 
@@ -118,7 +119,7 @@ def _get(self, version, method, url_or_urls, **kwargs):
 
         url = 'http://api.embed.ly/%s/%s?%s' % (version, method, query)
 
-        http = httplib2.Http()
+        http = httplib2.Http(timeout=self.timeout)
 
         headers = {'User-Agent' : self.user_agent}