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

Fix for issue #22 (searchTwitter failing due to args specification); searchTwitter/searchTwitterGen now default to enforcing UTF-8 conversion, constructApiURL calls fixed, guess_mime_type() function consolidated/removed, bump to version 1.3.4 for small release with bug fixes

Browse source
This commit is contained in:
Ryan McGrath 2010-10-29 00:31:27 -04:00
parent f9fc3b4a7c
commit 969a1b3578
2 changed files with 12 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

20
twython/twython.py
View file

@ -9,7 +9,7 @@
""" """
__author__ = "Ryan McGrath <ryan@venodesigns.net>" __author__ = "Ryan McGrath <ryan@venodesigns.net>"
__version__ = "1.3.3" __version__ = "1.3.4"
import urllib import urllib
import urllib2 import urllib2
@ -209,8 +209,8 @@ class Twython(object):
# ------------------------------------------------------------------------------------------------------------------------ # ------------------------------------------------------------------------------------------------------------------------
@staticmethod @staticmethod
def constructApiURL(self, base_url, params): def constructApiURL(base_url, params):
return base_url + "?" + "&".join(["%s=%s" %(key, value) for (key, value) in params.iteritems()]) return base_url + "?" + "&".join(["%s=%s" %(Twython.unicode2utf8(key), Twython.unicode2utf8(value)) for (key, value) in params.iteritems()])
@staticmethod @staticmethod
def shortenURL(url_to_shorten, shortener = "http://is.gd/api.php", query = "longurl"): def shortenURL(url_to_shorten, shortener = "http://is.gd/api.php", query = "longurl"):
@ -264,7 +264,7 @@ class Twython(object):
e.g x.searchTwitter(q="jjndf", page="2") e.g x.searchTwitter(q="jjndf", page="2")
""" """
searchURL = Twython.constructApiURL("http://search.twitter.com/search.json", kwargs) + "&" + urllib.urlencode({"q": Twython.unicode2utf8(search_query)}) searchURL = Twython.constructApiURL("http://search.twitter.com/search.json", kwargs)
try: try:
resp, content = self.client.request(searchURL, "GET") resp, content = self.client.request(searchURL, "GET")
return simplejson.loads(content) return simplejson.loads(content)
@ -281,7 +281,7 @@ class Twython(object):
e.g x.searchTwitter(q="jjndf", page="2") e.g x.searchTwitter(q="jjndf", page="2")
""" """
searchURL = Twython.constructApiURL("http://search.twitter.com/search.json", kwargs) + "&" + urllib.urlencode({"q": Twython.unicode2utf8(search_query)}) searchURL = Twython.constructApiURL("http://search.twitter.com/search.json", kwargs)
try: try:
resp, content = self.client.request(searchURL, "GET") resp, content = self.client.request(searchURL, "GET")
data = simplejson.loads(content) data = simplejson.loads(content)
@ -394,7 +394,7 @@ class Twython(object):
for (key, filename, value) in files: for (key, filename, value) in files:
L.append('--' + BOUNDARY) L.append('--' + BOUNDARY)
L.append('Content-Disposition: form-data; name="%s"; filename="%s"' % (key, filename)) L.append('Content-Disposition: form-data; name="%s"; filename="%s"' % (key, filename))
L.append('Content-Type: %s' % Twython.get_content_type(filename)) L.append('Content-Type: %s' % mimetypes.guess_type(filename)[0] or 'application/octet-stream')
L.append('') L.append('')
L.append(value) L.append(value)
L.append('--' + BOUNDARY + '--') L.append('--' + BOUNDARY + '--')
@ -403,14 +403,6 @@ class Twython(object):
content_type = 'multipart/form-data; boundary=%s' % BOUNDARY content_type = 'multipart/form-data; boundary=%s' % BOUNDARY
return content_type, body return content_type, body
@staticmethod
def get_content_type(filename):
""" get_content_type(self, filename)
Exactly what you think it does. :D
"""
return mimetypes.guess_type(filename)[0] or 'application/octet-stream'
@staticmethod @staticmethod
def unicode2utf8(text): def unicode2utf8(text):
try: try:

20
twython3k/twython.py
View file

@ -9,7 +9,7 @@
""" """
__author__ = "Ryan McGrath <ryan@venodesigns.net>" __author__ = "Ryan McGrath <ryan@venodesigns.net>"
__version__ = "1.3.3" __version__ = "1.3.4"
import urllib.request, urllib.parse, urllib.error import urllib.request, urllib.parse, urllib.error
import urllib.request, urllib.error, urllib.parse import urllib.request, urllib.error, urllib.parse
@ -209,8 +209,8 @@ class Twython(object):
# ------------------------------------------------------------------------------------------------------------------------ # ------------------------------------------------------------------------------------------------------------------------
@staticmethod @staticmethod
def constructApiURL(self, base_url, params): def constructApiURL(base_url, params):
return base_url + "?" + "&".join(["%s=%s" %(key, value) for (key, value) in params.items()]) return base_url + "?" + "&".join(["%s=%s" %(Twython.unicode2utf8(key), Twython.unicode2utf8(value)) for (key, value) in params.items()])
@staticmethod @staticmethod
def shortenURL(url_to_shorten, shortener = "http://is.gd/api.php", query = "longurl"): def shortenURL(url_to_shorten, shortener = "http://is.gd/api.php", query = "longurl"):
@ -264,7 +264,7 @@ class Twython(object):
e.g x.searchTwitter(q="jjndf", page="2") e.g x.searchTwitter(q="jjndf", page="2")
""" """
searchURL = Twython.constructApiURL("http://search.twitter.com/search.json", kwargs) + "&" + urllib.parse.urlencode({"q": Twython.unicode2utf8(search_query)}) searchURL = Twython.constructApiURL("http://search.twitter.com/search.json", kwargs)
try: try:
resp, content = self.client.request(searchURL, "GET") resp, content = self.client.request(searchURL, "GET")
return simplejson.loads(content) return simplejson.loads(content)
@ -281,7 +281,7 @@ class Twython(object):
e.g x.searchTwitter(q="jjndf", page="2") e.g x.searchTwitter(q="jjndf", page="2")
""" """
searchURL = Twython.constructApiURL("http://search.twitter.com/search.json", kwargs) + "&" + urllib.parse.urlencode({"q": Twython.unicode2utf8(search_query)}) searchURL = Twython.constructApiURL("http://search.twitter.com/search.json", kwargs)
try: try:
resp, content = self.client.request(searchURL, "GET") resp, content = self.client.request(searchURL, "GET")
data = simplejson.loads(content) data = simplejson.loads(content)
@ -394,7 +394,7 @@ class Twython(object):
for (key, filename, value) in files: for (key, filename, value) in files:
L.append('--' + BOUNDARY) L.append('--' + BOUNDARY)
L.append('Content-Disposition: form-data; name="%s"; filename="%s"' % (key, filename)) L.append('Content-Disposition: form-data; name="%s"; filename="%s"' % (key, filename))
L.append('Content-Type: %s' % Twython.get_content_type(filename)) L.append('Content-Type: %s' % mimetypes.guess_type(filename)[0] or 'application/octet-stream')
L.append('') L.append('')
L.append(value) L.append(value)
L.append('--' + BOUNDARY + '--') L.append('--' + BOUNDARY + '--')
@ -403,14 +403,6 @@ class Twython(object):
content_type = 'multipart/form-data; boundary=%s' % BOUNDARY content_type = 'multipart/form-data; boundary=%s' % BOUNDARY
return content_type, body return content_type, body
@staticmethod
def get_content_type(filename):
""" get_content_type(self, filename)
Exactly what you think it does. :D
"""
return mimetypes.guess_type(filename)[0] or 'application/octet-stream'
@staticmethod @staticmethod
def unicode2utf8(text): def unicode2utf8(text):
try: try: