DrSkippy · jshorish · Jan 20, 2015
diff --git a/src/README b/src/README
diff --git a/src/accept_job.py b/src/accept_job.py
@@ -3,8 +3,8 @@
 class AcceptJob(GnipHistoricalCmd):
     def __call__(self):
         if self.userUrl is None:
-            print "Please provide a job URL. Use accept_job.py -h for more information."
+            print("Please provide a job URL. Use accept_job.py -h for more information.")
         else:
-            print "RESULT:"
-            print str(self.gnipHistorical.acceptJob(self.userUrl))
+            print ("RESULT:")
+            print (str(self.gnipHistorical.acceptJob(self.userUrl)))
 AcceptJob()()
diff --git a/src/create_job.py b/src/create_job.py
@@ -10,16 +10,16 @@ def setOptions(self, parser):
 
     def __call__(self):
         if self.options.fileName is None:
-            print "Please provide a job description file. Use create_job.py -h for more information."
+            print("Please provide a job description file. Use create_job.py -h for more information.")
         else:    
             self.gnipHistorical.jobPars = JobParameters(self.options.title, jobFileName = self.options.fileName)
-            print "#"*35
-            print "CREATING JOB: (%s)"%self.gnipHistorical.jobPars.getTitle()
-            print "PARAMETERS:"
-            print str(self.gnipHistorical.jobPars)
-            print "RESPONSE:"
+            print("#"*35)
+            print("CREATING JOB: (%s)"%self.gnipHistorical.jobPars.getTitle())
+            print("PARAMETERS:")
+            print(str(self.gnipHistorical.jobPars))
+            print("RESPONSE:")
             res = self.gnipHistorical.createJob()
-            print str(res)
+            print(str(res))
             if res.jobURL is not None:
                 self.updateURLConfig(url = res.jobURL)
 

diff --git a/src/gnip_historical/__init__.py b/src/gnip_historical/__init__.py
@@ -0,0 +1 @@
+__all__ = ["gnip_historical", "gnip_historical_cmd", "gnip_historical_job"]
diff --git a/src/gnip_historical/gnip_historical.py b/src/gnip_historical/gnip_historical.py
@@ -3,11 +3,11 @@
 import json
 import sys
 import datetime
-from gnip_historical_job import *
+from gnip_historical.gnip_historical_job import *
 
 class DataSetResults(object):
     def __init__(self, resDict):
-        #print resDict.keys()
+        #print(resDict.keys())
         if "urlList" in resDict:
             self.dataURLs = resDict["urlList"]
         elif "url_list" in resDict:
@@ -32,11 +32,11 @@ def __init__(self, resDict):
             self.suspectMinuteURLs = []
 
     def write(self):
-        with open("./data_files.txt", "wb") as f:
+        with open("./data_files.txt", "w") as f:
             for i in self.dataURLs:
                 f.write("%s\n"%i)
-        if self.suspectMinuteURLs <> []:
-            with open("./suspect_files.txt", "wb") as f:
+        if self.suspectMinuteURLs != []:
+            with open("./suspect_files.txt", "w") as f:
                 for i in self.suspectMinuteURLs:
                     f.write("%s\n"%i)
 
@@ -64,7 +64,7 @@ def __repr__(self):
 #
 class Result(object):
     def __init__(self, resDict, gnipHist):
-        #print str(resDict)
+        #print(str(resDict))
         self.completedAt = datetime.datetime.strptime(DATE_RE.search(resDict["completedAt"]).group(0),DATEFMT)
         try:
             self.activityCount = int(resDict["activityCount"])
@@ -244,9 +244,9 @@ def xJob(self, jobURL, payload):
             s.auth = (self.user_name, self.password)
             s.headers = {'content-type':'application/json'}
             res = s.put(jobURL, data=json.dumps(payload))
-        except requests.exceptions.ConnectionError, e:
+        except requests.exceptions.ConnectionError as e:
             print >> sys.stderr, "Server request failed with message {}".format(e)
-        except requests.exceptions.HTTPError, e:
+        except requests.exceptions.HTTPError as e:
             print >> sys.stderr, "Server request failed with message {}".format(e)
         if res is not None and res.status_code == 200:
             return "Job {}ed successfully".format(payload["status"])
@@ -260,10 +260,10 @@ def createJob(self):
             s.auth = (self.user_name, self.password)
             s.headers = {'content-type':'application/json'}
             res = s.post(self.baseUrl + "jobs.json", data=str(self.jobPars))
-        except requests.exceptions.ConnectionError, e:
-            print >> sys.stderr, "Server request failed with message {}".format(e)
-        except requests.exceptions.HTTPError, e:
-            print >> sys.stderr, "Server request failed with message {}".format(e)
+        except requests.exceptions.ConnectionError as e:
+            print("Server request failed with message {}".format(e), file=sys.stderr)
+        except requests.exceptions.HTTPError as e:
+            print("Server request failed with message {}".format(e), file=sys.stderr)
         return Status(res.json())
 
     def listJobs(self):
@@ -274,10 +274,10 @@ def listJobs(self):
             s = requests.Session()
             s.auth = (self.user_name, self.password)
             res = s.get(self.baseUrl + "jobs.json")
-        except requests.exceptions.ConnectionError, e:
-            print >> sys.stderr, "Server request failed with message {}".format(e)
-        except requests.exceptions.HTTPError, e:
-            print >> sys.stderr, "Server request failed with message {}".format(e)
+        except requests.exceptions.ConnectionError as e:
+            print("Server request failed with message {}".format(e), file=sys.stderr)
+        except requests.exceptions.HTTPError as e:
+            print("Server request failed with message {}".format(e), file=sys.stderr)
         if res is not None and "jobs" in res.json():
             for x in res.json()["jobs"]:
                 yield Status(x)
@@ -293,10 +293,10 @@ def getDataURLDict(self, URL):
             s = requests.Session()
             s.auth = (self.user_name, self.password)
             res = s.get(URL)
-        except requests.exceptions.ConnectionError, e:
-            print >> sys.stderr, "Server request failed with message {}".format(e)
-        except requests.exceptions.HTTPError, e:
-            print >> sys.stderr, "Server request failed with message {}".format(e)
+        except requests.exceptions.ConnectionError as e:
+            print("Server request failed with message {}".format(e), file=sys.stderr)
+        except requests.exceptions.HTTPError as e:
+            print("Server request failed with message {}".format(e), file=sys.stderr)
         if res is not None:
             return res.json()
         else:
@@ -317,10 +317,10 @@ def getJobStatusDict(self, jobURL = None):
             s = requests.Session()
             s.auth = (self.user_name, self.password)
             res = s.get(jobURL)
-        except requests.exceptions.ConnectionError, e:
-            print >> sys.stderr, "Server request failed with message {}".format(e)
-        except requests.exceptions.HTTPError, e:
-            print >> sys.stderr, "Server request failed with message {}".format(e)
+        except requests.exceptions.ConnectionError as e:
+            print("Server request failed with message {}".format(e), file=sys.stderr)
+        except requests.exceptions.HTTPError as e:
+            print("Server request failed with message {}".format(e), file=sys.stderr)
         if res is not None:
             return res.json()
         else:
@@ -370,50 +370,50 @@ def results(self, jobURL = None):
     jp.setToDate("2012-01-01T00:01:00")
     tmp = jp.getToDate()
     jp.setToDate("201201010001") # same as above
-    print jp.getToDate(), "=", tmp
+    print(jp.getToDate(), "=", tmp)
     jp.setUser("DrSkippy27")
     jp.addRule("bieber", "bestRuleEver")
     # job json as string
-    print jp
+    print(jp)
     # job json as dict
     pprint(jp.job)
-    print "Job duration = ",jp.duration().seconds
-    print
+    print("Job duration = ",jp.duration().seconds)
+    print()
     # Example 2
     # save job description in file
     jp.writeToFile("./bieber_job1.json")
     # Example 3
     # read job description from file
     jp1 = JobParameters("BieberJob2", jobFileName = "./FileMissing.JSON") # this file doesn't exist
     jp1 = JobParameters("BieberJob2", jobFileName = "./bieber_job1.json")
-    print jp1
-    print
+    print(jp1)
+    print()
     # mess it up
     jp1.setFromDate("2012-01-01T00:02:00")
     try:
-        print jp1 # error
-    except ValueError, e:
-        print e
-    print
+        print(jp1) # error
+    except ValueError as e:
+        print(e)
+    print()
     # Example 4
     # working with rules
     jp3 = JobParameters("BieberJob2", jobFileName = "./bieber_job1.json")
     jp3.setRules([{"value": "no bieber"}])
-    print jp3
+    print(jp3)
     jp3.addRule("belieber")
-    print jp3
+    print(jp3)
     jp3.setRules('[{value":"one"}]') # error this is missing a quote
     jp3.setRules('[{"value":"one"}]')
-    print jp3
+    print(jp3)
     ####################################
     # Historical 1 - Change if you want to hit the server
     # r = GnipHistorical("user", "password", "https://historical.gnip.com/accounts/<yours>", jp)
     # Creates a job
-    # print r.createJob()
+    # print(r.createJob())
     try:
         r.acceptJob("not a URL") # error
-    except ValueError,e:
-        print e
+    except ValueError as e:
+        print(e)
     # r.rejectJob("not a URL") # error
     # r.jobStatus("not a URL") # error
     # r.jobs() # get a list of jobs from the gnip server
diff --git a/src/gnip_historical/gnip_historical_cmd.py b/src/gnip_historical/gnip_historical_cmd.py
@@ -1,18 +1,18 @@
 #!/usr/bin/env python
-import ConfigParser
+import configparser
 from optparse import OptionParser
-from gnip_historical import *
+from gnip_historical.gnip_historical import *
 
 DEFAULT_FILE_NAME='./.gnip'
 
 class GnipHistoricalCmd(object):
     def __init__(self, jobPar=None):
-        self.config = ConfigParser.ConfigParser()
+        self.config = configparser.ConfigParser()
         self.config.read(DEFAULT_FILE_NAME)
-        un = self.config.get('creds', 'un')
-        pwd = self.config.get('creds', 'pwd')
-        endURL = self.config.get('endpoint', 'url')
-        self.prevurl = self.config.get('tmp','prevUrl')
+        un = self.config['creds']['un']
+        pwd = self.config['creds']['pwd']
+        endURL = self.config['endpoint']['url']
+        self.prevurl = self.config['tmp']['prevUrl']
         parser = OptionParser()
         parser.add_option("-u", "--url", dest="url", default=None,
                     help="Job url.")
@@ -30,16 +30,17 @@ def setOptions(self, parser):
         #            help="Use the prev Job URL.")
         pass
 
-    def updateURLConfig(self, url = None):
+    def updateURLConfig(self, url = 'None'):
         if self.options.prevUrl:
             self.userUrl = self.prevurl
-        elif self.options.url is not None:
+        elif self.options.url is not 'None':
             self.userUrl = self.options.url
-        elif url is not None:
+        elif url is not 'None':
             self.userUrl = url
         else:
-            self.userUrl = None
-        self.config.set('tmp','prevUrl',self.userUrl)
-        with open(DEFAULT_FILE_NAME, 'wb') as self.configfile:
+            self.userUrl = 'None'
+        print(self.userUrl)
+        self.config['tmp']['prevUrl'] = str(self.userUrl)
+        with open(DEFAULT_FILE_NAME, 'w') as self.configfile:
             self.config.write(self.configfile)
 
diff --git a/src/gnip_historical/gnip_historical_job.py b/src/gnip_historical/gnip_historical_job.py
@@ -32,28 +32,28 @@ def __init__(self, title, jobDict = None, jobFileName = None):
         elif jobFileName is not None:
             # lastly, try to read json from file
             try:
-                with codecs.open(jobFileName,"rb","utf-8") as tmpJobFile:
+                with codecs.open(jobFileName,"r","utf-8") as tmpJobFile:
                     tmp = tmpJobFile.read()
                     try:
                         tmpJob = json.loads(tmp)
                         for test_key in self.job.keys():
                             if test_key not in tmpJob:
                                 raise ValueError("Required fields missing ({})".format(test_key))
                         self.job = tmpJob
-                    except ValueError, e:
+                    except ValueError as e:
                         sys.stderr.write("Failed to parse input JSON. (%s). Exiting.\n"%e)
                         sys.exit()
                 self.setToDate(tmpJob["toDate"])
                 self.setFromDate(tmpJob["fromDate"])
-            except IOError,e:
+            except IOError as e:
                 sys.stderr.write("Failed to open rules file. (%s)\n"%e)
         # Given title supercedes file title, otherwise, use give title
         if title is not None:
             self.setTitle(title)
 
     def writeToFile(self, jobFileName):
         """Write current configuration as a job file"""
-        with codecs.open(jobFileName,"wb","utf-8") as tmpJobFile:
+        with codecs.open(jobFileName,"w","utf-8") as tmpJobFile:
             tmpJobFile.write(str(self))
 
     def setTitle(self, t):
@@ -117,7 +117,7 @@ def setRules(self, ruleList):
         elif type(ruleList) == type("string"):
             try:
                 self.job["rules"] = json.loads(ruleList)
-            except ValueError, e:
+            except ValueError as e:
                 sys.stderr.write("Failed to set rules by parsing JSON string. (%s)\n"%e)
         else:
             sys.stderr.write("Failed to set rules. Check argument type is list of valid rules or string with valid JSON.\n")

diff --git a/src/list_jobs.py b/src/list_jobs.py
@@ -18,24 +18,24 @@ def output(self, status):
         else:
             if self.options.verbose:
                 status = self.gnipHistorical.getJobStatus(status.jobURL)
-                print str(status)
+                print(str(status))
                 if status.result is not None:
                     status.result.write()
             else:
-                print "#"*25
-                print "TITLE:    ",status.title
-                print "STATUS:   ",status.status
-                print "PROGRESS: ",status.percentComplete,"%"
-                print "JOB URL:  ",status.jobURL
+                print("#"*25)
+                print("TITLE:    ",status.title)
+                print("STATUS:   ",status.status)
+                print("PROGRESS: ",status.percentComplete,"%")
+                print("JOB URL:  ",status.jobURL)
                 if self.options.prevUrl or self.options.url is not None:
                     if status.result is not None:
-                        print
-                        print str(status.quote)
-                        print str(status.result)
-                        print "Writing files to data_files.txt..."
+                        print()
+                        print(str(status.quote))
+                        print(str(status.result))
+                        print("Writing files to data_files.txt...")
                         status.result.write()
                 elif status.status.lower().startswith("delivered"):
-                    print 'Data files available, use "-v, -u or -l" flag to download files list.'
+                    print('Data files available, use "-v, -u or -l" flag to download files list.')
 
     def __call__(self):
         if self.userUrl is None:

diff --git a/src/name_mangle.py b/src/name_mangle.py
@@ -8,4 +8,4 @@
     # https://archive.replay.snapshots.review.s3.amazonaws.com/snapshots/twitter/track/activity-streams/shendrickson/2012/08/13/20090101-20100101_c9pe0day6h/2009/12/31/23/50_activities.json.gz?AWSAccessKeyId=AKIAI3ZYYXK57KIWDGHQ&Expires=1347654202&Signature=ej8iMVWVfYZE6qVGi%2FU%2FY5clnb0%3D
     infile = line.split("?")[0]
     # https://archive.replay.snapshots.review.s3.amazonaws.com/snapshots/twitter/track/activity-streams/shendrickson/2012/08/13/20090101-20100101_c9pe0day6h/2009/12/31/23/50_activities.json.gz
-    print dateRE.search(infile).group(0) + nameRE.search(infile).group(0) + ".json.gz"
+    print(dateRE.search(infile).group(0) + nameRE.search(infile).group(0) + ".json.gz")
diff --git a/src/reject_job.py b/src/reject_job.py
@@ -3,8 +3,8 @@
 class RejectJob(GnipHistoricalCmd):
     def __call__(self):
         if self.userUrl is None:
-            print "Please provide a job URL. Use reject_job.py -h for more information."
+            print("Please provide a job URL. Use reject_job.py -h for more information.")
         else:
-            print "RESULT:"
-            print str(self.gnipHistorical.rejectJob(self.userUrl))
+            print("RESULT:")
+            print(str(self.gnipHistorical.rejectJob(self.userUrl)))
 RejectJob()()
diff --git a/src/setup.py b/src/setup.py
@@ -10,6 +10,6 @@
     url='http://pypi.python.org/pypi/gnip-historical/',
     license='LICENSE.txt',
     description='Gnip Historical libarary and command scripts.',
-    install_requires=["requests > 1.2.2"],
+    requires=["requests(>1.2.2)"],
     long_description=open('README').read(),
 )
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		__all__ = ["gnip_historical", "gnip_historical_cmd", "gnip_historical_job"]