code/twython
1
Fork 0
Code Issues 23 Pull requests 4 Projects Releases 5 Packages Wiki Activity Actions

2.3.4 release, requires requests 0.13.4 >, basically we don't have to url encode params anymore and can just pass a dict of params to the request (finally! :D)

Browse source
This commit is contained in:
Mike Helmick 2012-07-27 12:10:36 -04:00
parent e1c4035a63
commit 9e5a96655d
2 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
setup.py
View file

@ -4,7 +4,7 @@ from setuptools import setup
from setuptools import find_packages from setuptools import find_packages
__author__ = 'Ryan McGrath <ryan@venodesigns.net>' __author__ = 'Ryan McGrath <ryan@venodesigns.net>'
__version__ = '2.3.3' __version__ = '2.3.4'
setup( setup(
# Basic package information. # Basic package information.
@ -16,7 +16,7 @@ setup(
include_package_data=True, include_package_data=True,
# Package dependencies. # Package dependencies.
install_requires=['simplejson', 'requests>=0.13.2'], install_requires=['simplejson', 'requests>=0.13.4'],
# Metadata for PyPI. # Metadata for PyPI.
author='Ryan McGrath', author='Ryan McGrath',

13
twython/twython.py
View file

@ -9,7 +9,7 @@
""" """
__author__ = "Ryan McGrath <ryan@venodesigns.net>" __author__ = "Ryan McGrath <ryan@venodesigns.net>"
__version__ = "2.3.3" __version__ = "2.3.4"
import urllib import urllib
import re import re
@ -168,9 +168,7 @@ class Twython(object):
func = getattr(self.client, method) func = getattr(self.client, method)
if method == 'get': if method == 'get':
# Still wasn't fixed in `requests` 0.13.2? :( response = func(url, params=params)
url = url + '?' + urllib.urlencode(params)
response = func(url)
else: else:
response = func(url, data=params, files=files) response = func(url, data=params, files=files)
content = response.content.decode('utf-8') content = response.content.decode('utf-8')
@ -262,8 +260,7 @@ class Twython(object):
if self.callback_url: if self.callback_url:
request_args['oauth_callback'] = self.callback_url request_args['oauth_callback'] = self.callback_url
req_url = self.request_token_url + '?' + urllib.urlencode(request_args) response = self.client.get(self.request_token_url, params=request_args)
response = self.client.get(req_url)
if response.status_code != 200: if response.status_code != 200:
raise TwythonAuthError("Seems something couldn't be verified with your OAuth junk. Error: %s, Message: %s" % (response.status_code, response.content)) raise TwythonAuthError("Seems something couldn't be verified with your OAuth junk. Error: %s, Message: %s" % (response.status_code, response.content))
@ -463,9 +460,9 @@ class Twython(object):
version Twitter has now version Twitter has now
""" """
endpoint = 'users/profile_image/%s' % username endpoint = 'users/profile_image/%s' % username
url = self.api_url % version + '/' + endpoint + '?' + urllib.urlencode({'size': size}) url = self.api_url % version + '/' + endpoint
response = self.client.get(url, allow_redirects=False) response = self.client.get(url, params={'size': size}, allow_redirects=False)
image_url = response.headers.get('location') image_url = response.headers.get('location')
if response.status_code in (301, 302, 303, 307) and image_url is not None: if response.status_code in (301, 302, 303, 307) and image_url is not None: