Skip to content

Fix version import #19

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
joncotton merged 2 commits into from
Nov 15, 2013
Merged

Fix version import #19

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b40857
Fix __version__ import.
joncotton Aug 29, 2013
7848681
Tidying - reorder params and add a documentation line for third param.
joncotton Aug 29, 2013
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
Prev Previous commit
Tidying - reorder params and add a documentation line for third param.
  • Loading branch information
@joncotton
joncotton committed Aug 29, 2013
commit 78486817eb2cff81df079edea1a9a0c87fef8c6f
10 changes: 6 additions & 4 deletions embedly/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,20 @@ def __init__(self, key=None, user_agent=None, timeout=60):
"""
Initialize the Embedly client

:param user_agent: User Agent passed to Embedly
:type user_agent: str
:param key: Embedly Pro key
:type key: str
:param user_agent: User Agent passed to Embedly
:type user_agent: str
:param timeout: timeout for HTTP connection attempts
:type timeout: int

:returns: None
"""
self.key = key
self.user_agent = user_agent or get_user_agent()
self.timeout = timeout
self.key = key
self.services = []

self.services = []
self._regex = None

def get_services(self):
Expand Down