From 3b9527ae698580fb5093434373f0663f423a5a83 Mon Sep 17 00:00:00 2001 From: Ryan McGrath Date: Wed, 20 Oct 2010 11:22:31 -0400 Subject: [PATCH] Fix constructApiURL method, version increment to fix function definitions in new versions --- setup.py | 2 +- twython/twython.py | 10 +++++++--- twython3k/twython.py | 10 +++++++--- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/setup.py b/setup.py index e4036e7..f33dcc9 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ from setuptools import setup from setuptools import find_packages __author__ = 'Ryan McGrath ' -__version__ = '1.3.2' +__version__ = '1.3.3' setup( # Basic package information. diff --git a/twython/twython.py b/twython/twython.py index 79bf641..0890e95 100644 --- a/twython/twython.py +++ b/twython/twython.py @@ -9,7 +9,7 @@ """ __author__ = "Ryan McGrath " -__version__ = "1.3.2" +__version__ = "1.3.3" import urllib import urllib2 @@ -208,6 +208,10 @@ class Twython(object): # but it's not high on the priority list at the moment. # ------------------------------------------------------------------------------------------------------------------------ + @staticmethod + def constructApiURL(self, base_url, params): + return base_url + "?" + "&".join(["%s=%s" %(key, value) for (key, value) in params.iteritems()]) + @staticmethod def shortenURL(url_to_shorten, shortener = "http://is.gd/api.php", query = "longurl"): """shortenURL(url_to_shorten, shortener = "http://is.gd/api.php", query = "longurl") @@ -260,7 +264,7 @@ class Twython(object): e.g x.searchTwitter(q="jjndf", page="2") """ - searchURL = self.constructApiURL("http://search.twitter.com/search.json", kwargs) + "&" + urllib.urlencode({"q": self.unicode2utf8(search_query)}) + searchURL = Twython.constructApiURL("http://search.twitter.com/search.json", kwargs) + "&" + urllib.urlencode({"q": Twython.unicode2utf8(search_query)}) try: resp, content = self.client.request(searchURL, "GET") return simplejson.loads(content) @@ -277,7 +281,7 @@ class Twython(object): e.g x.searchTwitter(q="jjndf", page="2") """ - searchURL = self.constructApiURL("http://search.twitter.com/search.json", kwargs) + "&" + urllib.urlencode({"q": self.unicode2utf8(search_query)}) + searchURL = Twython.constructApiURL("http://search.twitter.com/search.json", kwargs) + "&" + urllib.urlencode({"q": Twython.unicode2utf8(search_query)}) try: resp, content = self.client.request(searchURL, "GET") data = simplejson.loads(content) diff --git a/twython3k/twython.py b/twython3k/twython.py index bdc84ba..f78a962 100644 --- a/twython3k/twython.py +++ b/twython3k/twython.py @@ -9,7 +9,7 @@ """ __author__ = "Ryan McGrath " -__version__ = "1.3.2" +__version__ = "1.3.3" import urllib.request, urllib.parse, urllib.error import urllib.request, urllib.error, urllib.parse @@ -208,6 +208,10 @@ class Twython(object): # but it's not high on the priority list at the moment. # ------------------------------------------------------------------------------------------------------------------------ + @staticmethod + def constructApiURL(self, base_url, params): + return base_url + "?" + "&".join(["%s=%s" %(key, value) for (key, value) in params.items()]) + @staticmethod def shortenURL(url_to_shorten, shortener = "http://is.gd/api.php", query = "longurl"): """shortenURL(url_to_shorten, shortener = "http://is.gd/api.php", query = "longurl") @@ -260,7 +264,7 @@ class Twython(object): e.g x.searchTwitter(q="jjndf", page="2") """ - searchURL = self.constructApiURL("http://search.twitter.com/search.json", kwargs) + "&" + urllib.parse.urlencode({"q": self.unicode2utf8(search_query)}) + searchURL = Twython.constructApiURL("http://search.twitter.com/search.json", kwargs) + "&" + urllib.parse.urlencode({"q": Twython.unicode2utf8(search_query)}) try: resp, content = self.client.request(searchURL, "GET") return simplejson.loads(content) @@ -277,7 +281,7 @@ class Twython(object): e.g x.searchTwitter(q="jjndf", page="2") """ - searchURL = self.constructApiURL("http://search.twitter.com/search.json", kwargs) + "&" + urllib.parse.urlencode({"q": self.unicode2utf8(search_query)}) + searchURL = Twython.constructApiURL("http://search.twitter.com/search.json", kwargs) + "&" + urllib.parse.urlencode({"q": Twython.unicode2utf8(search_query)}) try: resp, content = self.client.request(searchURL, "GET") data = simplejson.loads(content)