Skip to content
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.

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

catch up with embedly master #1

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ The client object now has a bunch of different methods that you can use.
>>> client.objectify('http://vimeo.com/18150336')
<embedly.models.Url at 0x10223d950>

The above functions all take the same arguements, a URL or a list of URLs and
The above functions all take the same arguments, a URL or a list of URLs and
keyword arguments that correspond to Embedly's `query arguments
<http://embed.ly/docs/endpoints/arguments>`_. Here is an example::

Expand Down
2 changes: 1 addition & 1 deletion embedly/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from __future__ import absolute_import
from .client import Embedly

__version__ = '0.5.0'
__version__ = '0.5.0.post0'
4 changes: 2 additions & 2 deletions embedly/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def get_services(self):
if self.services:
return self.services

url = 'http://api.embed.ly/1/services/python'
url = 'https://api.embed.ly/1/services/python'

http = httplib2.Http(timeout=self.timeout)
headers = {'User-Agent': self.user_agent,
Expand Down Expand Up @@ -122,7 +122,7 @@ def _get(self, version, method, url_or_urls, **kwargs):
else:
query += '&url=%s' % quote(url_or_urls)

url = 'http://api.embed.ly/%s/%s?%s' % (version, method, query)
url = 'https://api.embed.ly/%s/%s?%s' % (version, method, query)

http = httplib2.Http(timeout=self.timeout)

Expand Down
2 changes: 1 addition & 1 deletion embedly/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class Url(IterableUserDict, object):
"""
A dictionary with two additional attributes for the method and url.
UserDict provides a dictionary interface along with the regular
dictionary accsesible via the `data` attribute.
dictionary accessible via the `data` attribute.

"""
def __init__(self, data=None, method=None, original_url=None, **kwargs):
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def get_version():
test_suite="embedly.tests",
zip_safe=True,
use_2to3=True,
classifiers=(
classifiers=[
'Development Status :: 5 - Production/Stable',
'Intended Audience :: Developers',
'Natural Language :: English',
Expand All @@ -54,5 +54,5 @@ def get_version():
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3.2',
'Programming Language :: Python :: 3.3',
)
]
)