From 88fb462e01cdba4b1e234e5fa7ff2ed336f4acaa Mon Sep 17 00:00:00 2001 From: Chris Chomicki Date: Tue, 28 Nov 2017 17:46:12 -0500 Subject: [PATCH 1/2] Fixed functionality for Python3 Added functionality for searching by location and changed 'urllib2' to 'urllib.requests' for use in Python 3 that Python 2 version had --- got3/manager/TweetManager.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/got3/manager/TweetManager.py b/got3/manager/TweetManager.py index 5c627749..b419a9ce 100644 --- a/got3/manager/TweetManager.py +++ b/got3/manager/TweetManager.py @@ -100,6 +100,9 @@ def getJsonReponse(tweetCriteria, refreshCursor, cookieJar, proxy): if hasattr(tweetCriteria, 'querySearch'): urlGetData += ' ' + tweetCriteria.querySearch + if hasattr(tweetCriteria, 'near'): + urlGetData += "&near:" + tweetCriteria.near + " within:" + tweetCriteria.within + if hasattr(tweetCriteria, 'lang'): urlLang = 'lang=' + tweetCriteria.lang + '&' else: @@ -118,9 +121,9 @@ def getJsonReponse(tweetCriteria, refreshCursor, cookieJar, proxy): ] if proxy: - opener = urllib2.build_opener(urllib2.ProxyHandler({'http': proxy, 'https': proxy}), urllib2.HTTPCookieProcessor(cookieJar)) + opener = urllib.request.build_opener(urllib.request.ProxyHandler({'http': proxy, 'https': proxy}), urllib.request.HTTPCookieProcessor(cookieJar)) else: - opener = urllib2.build_opener(urllib2.HTTPCookieProcessor(cookieJar)) + opener = urllib.request.build_opener(urllib.request.HTTPCookieProcessor(cookieJar)) opener.addheaders = headers try: @@ -135,4 +138,4 @@ def getJsonReponse(tweetCriteria, refreshCursor, cookieJar, proxy): dataJson = json.loads(jsonResponse.decode()) - return dataJson \ No newline at end of file + return dataJson From 2cb3a65836ccb1aa50cacbc47e1a97bbcd57ac1e Mon Sep 17 00:00:00 2001 From: Chris Chomicki Date: Tue, 28 Nov 2017 18:17:52 -0500 Subject: [PATCH 2/2] Update TweetManager.py --- got3/manager/TweetManager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/got3/manager/TweetManager.py b/got3/manager/TweetManager.py index b419a9ce..9f8983c2 100644 --- a/got3/manager/TweetManager.py +++ b/got3/manager/TweetManager.py @@ -101,7 +101,7 @@ def getJsonReponse(tweetCriteria, refreshCursor, cookieJar, proxy): urlGetData += ' ' + tweetCriteria.querySearch if hasattr(tweetCriteria, 'near'): - urlGetData += "&near:" + tweetCriteria.near + " within:" + tweetCriteria.within + urlGetData += "&near:" + tweetCriteria.near + "within:" + tweetCriteria.within if hasattr(tweetCriteria, 'lang'): urlLang = 'lang=' + tweetCriteria.lang + '&'