Skip to content

Support setting timeout of connection #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
screeley merged 1 commit into from
Nov 28, 2012
Merged

Support setting timeout of connection #12

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions embedly/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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 = []

Expand All @@ -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)

Expand Down Expand Up @@ -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}

Expand Down