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

checkIfFriendshipExists() was previously throwing a POST, when it should've been doing a GET request. Up until this point, it would have returned HTTP 400 errors on all calls - fixed now (both Twython2k and Twython3k). Thanks to Risto Haukioja for pointing this out to me. ;)

Browse source
This commit is contained in:
Ryan McGrath 2009-09-01 02:11:46 -04:00
parent 80bc6f9fd0
commit 8f975506d5
2 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
twython.py
View file

@ -275,7 +275,7 @@ class setup:
""" """
if self.authenticated is True: if self.authenticated is True:
try: try:
return simplejson.load(self.opener.open("http://twitter.com/statuses/retweet/%s.json", "POST" % id)) return simplejson.load(self.opener.open("http://twitter.com/statuses/retweet/%s.json" % `id`, "POST"))
except HTTPError, e: except HTTPError, e:
raise TwythonError("reTweet() failed with a %s error code." % `e.code`, e.code) raise TwythonError("reTweet() failed with a %s error code." % `e.code`, e.code)
else: else:
@ -672,7 +672,8 @@ class setup:
""" """
if self.authenticated is True: if self.authenticated is True:
try: try:
return simplejson.load(self.opener.open("http://twitter.com/friendships/exists.json", urllib.urlencode({"user_a": user_a, "user_b": user_b}))) friendshipURL = "http://twitter.com/friendships/exists.json?%s" % urllib.urlencode({"user_a": user_a, "user_b": user_b})
return simplejson.load(self.opener.open(friendshipURL))
except HTTPError, e: except HTTPError, e:
raise TwythonError("checkIfFriendshipExists() failed with a %s error code." % `e.code`, e.code) raise TwythonError("checkIfFriendshipExists() failed with a %s error code." % `e.code`, e.code)
else: else:

15
twython3k.py
View file

@ -54,14 +54,14 @@ class AuthError(TwythonError):
return repr(self.msg) return repr(self.msg)
class setup: class setup:
def __init__(self, username = None, password = None, consumer_secret = None, consumer_key = None, headers = None): def __init__(self, authtype = "OAuth", username = None, password = None, consumer_secret = None, consumer_key = None, headers = None):
"""setup(authtype = "OAuth", username = None, password = None, consumer_secret = None, consumer_key = None, headers = None) """setup(authtype = "OAuth", username = None, password = None, consumer_secret = None, consumer_key = None, headers = None)
Instantiates an instance of Twython. Takes optional parameters for authentication and such (see below). Instantiates an instance of Twython. Takes optional parameters for authentication and such (see below).
Parameters: Parameters:
username - Your twitter username, if you want Basic (HTTP) Authentication username - Your Twitter username, if you want Basic (HTTP) Authentication.
password - Password for your twitter account, if you want Basic (HTTP) Authentication password - Password for your twitter account, if you want Basic (HTTP) Authentication.
consumer_secret - Consumer secret, if you want OAuth. consumer_secret - Consumer secret, if you want OAuth.
consumer_key - Consumer key, if you want OAuth. consumer_key - Consumer key, if you want OAuth.
headers - User agent header. headers - User agent header.
@ -79,7 +79,7 @@ class setup:
self.access_token = None self.access_token = None
# Check and set up authentication # Check and set up authentication
if self.username is not None and password is not None: if self.username is not None and password is not None:
# Basic authentication ritual # Assume Basic authentication ritual
self.auth_manager = urllib.request.HTTPPasswordMgrWithDefaultRealm() self.auth_manager = urllib.request.HTTPPasswordMgrWithDefaultRealm()
self.auth_manager.add_password(None, "http://twitter.com", self.username, password) self.auth_manager.add_password(None, "http://twitter.com", self.username, password)
self.handler = urllib.request.HTTPBasicAuthHandler(self.auth_manager) self.handler = urllib.request.HTTPBasicAuthHandler(self.auth_manager)
@ -275,7 +275,7 @@ class setup:
""" """
if self.authenticated is True: if self.authenticated is True:
try: try:
return simplejson.load(self.opener.open("http://twitter.com/statuses/retweet/%s.json", "POST" % id)) return simplejson.load(self.opener.open("http://twitter.com/statuses/retweet/%s.json" % repr(id), "POST"))
except HTTPError as e: except HTTPError as e:
raise TwythonError("reTweet() failed with a %s error code." % repr(e.code), e.code) raise TwythonError("reTweet() failed with a %s error code." % repr(e.code), e.code)
else: else:
@ -487,7 +487,7 @@ class setup:
""" """
if self.authenticated is True: if self.authenticated is True:
try: try:
return simplejson.load(self.opener.open("http://twitter.com/status/destroy/%s.json" % `id`, "POST")) return simplejson.load(self.opener.open("http://twitter.com/status/destroy/%s.json" % repr(id), "DELETE"))
except HTTPError as e: except HTTPError as e:
raise TwythonError("destroyStatus() failed with a %s error code." % repr(e.code), e.code) raise TwythonError("destroyStatus() failed with a %s error code." % repr(e.code), e.code)
else: else:
@ -672,7 +672,8 @@ class setup:
""" """
if self.authenticated is True: if self.authenticated is True:
try: try:
return simplejson.load(self.opener.open("http://twitter.com/friendships/exists.json", urllib.parse.urlencode({"user_a": user_a, "user_b": user_b}))) friendshipURL = "http://twitter.com/friendships/exists.json?%s" % urllib.parse.urlencode({"user_a": user_a, "user_b": user_b})
return simplejson.load(self.opener.open(friendshipURL))
except HTTPError as e: except HTTPError as e:
raise TwythonError("checkIfFriendshipExists() failed with a %s error code." % repr(e.code), e.code) raise TwythonError("checkIfFriendshipExists() failed with a %s error code." % repr(e.code), e.code)
else: else: