Merge pull request #6 from ehanson8/python3

Python 3 converion

Author: ehanson8

.gitignore

@@ -68,3 +68,5 @@ local/*
 .profile
 *.csv
 *.json
+Pipfile
+Pipfile.lock

checkInventory.py

@@ -1,52 +1,52 @@
-import argparse
-import pandas as pd
-import os
-
-
-def main():
-    # begin: argument parsing
-    parser = argparse.ArgumentParser()
-
-    parser.add_argument('-i', '--inventory', required=True,
-                        help='csv file containing the inventory. the path, if given, can be absolute or relative to this script')
-
-    parser.add_argument('-d', '--dataDir',
-                        help='directory containing the data. if omitted, data will be read from the directory containing the inventory file')
-
-    parser.add_argument('-f', '--field',
-                        help='field in the csv containing the fileNames. default: name')
-
-    parser.add_argument('-v', '--verbose', action='store_true',
-                        help='increase output verbosity')
-
-    args = parser.parse_args()
-
-    if not args.dataDir:
-        (args.dataDir, null) = os.path.split(args.inventory)
-
-    if not args.field:
-        args.field = 'name'
-
-    if args.verbose:
-        print('verbosity turned on')
-        print('reading inventory from {}'.format(args.inventory))
-        print('fileNames read from field named {}'.format(args.field))
-        print('searching for files in {}'.format(args.dataDir))
-    # end: argument parsing
-
-    inventory = pd.read_csv(args.inventory, usecols=[args.field])
-    fileNames = inventory[args.field]
-    foundfiles = 0
-    missingfiles = 0
-    for fileName in fileNames:
-        if os.path.isfile(args.dataDir + '/' + fileName):
-            if args.verbose: print('{} is not missing'.format(fileName))
-            foundfiles += 1
-        else:
-            print('{} is missing'.format(fileName))
-            missingfiles += 1
-
-    print('{} files found and {} files missing'.format(foundfiles, missingfiles))
-
-
-if __name__ == "__main__": main()
+import argparse
+import pandas as pd
+import os
+
+
+def main():
+    # begin: argument parsing
+    parser = argparse.ArgumentParser()
+
+    parser.add_argument('-i', '--inventory', required=True,
+                        help='csv file containing the inventory. the path, if given, can be absolute or relative to this script')
+
+    parser.add_argument('-d', '--dataDir',
+                        help='directory containing the data. if omitted, data will be read from the directory containing the inventory file')
+
+    parser.add_argument('-f', '--field',
+                        help='field in the csv containing the fileNames. default: name')
+
+    parser.add_argument('-v', '--verbose', action='store_true',
+                        help='increase output verbosity')
+
+    args = parser.parse_args()
+
+    if not args.dataDir:
+        (args.dataDir, null) = os.path.split(args.inventory)
+
+    if not args.field:
+        args.field = 'name'
+
+    if args.verbose:
+        print('verbosity turned on')
+        print('reading inventory from {}'.format(args.inventory))
+        print('fileNames read from field named {}'.format(args.field))
+        print('searching for files in {}'.format(args.dataDir))
+    # end: argument parsing
+
+    inventory = pd.read_csv(args.inventory, usecols=[args.field])
+    fileNames = inventory[args.field]
+    foundfiles = 0
+    missingfiles = 0
+    for fileName in fileNames:
+        if os.path.isfile(args.dataDir + '/' + fileName):
+            if args.verbose: print('{} is not missing'.format(fileName))
+            foundfiles += 1
+        else:
+            print('{} is missing'.format(fileName))
+            missingfiles += 1
+
+    print('{} files found and {} files missing'.format(foundfiles, missingfiles))
+
+
+if __name__ == "__main__": main()

compareTwoKeysInCommunity.py

@@ -1,122 +1,121 @@
-import json
-import requests
-import secrets
-import csv
-import time
-import urllib3
-import argparse
-
-secretsVersion = raw_input('To edit production server, enter the name of the secrets file: ')
-if secretsVersion != '':
-    try:
-        secrets = __import__(secretsVersion)
-        print 'Editing Production'
-    except ImportError:
-        print 'Editing Stage'
-else:
-    print 'Editing Stage'
-
-parser = argparse.ArgumentParser()
-parser.add_argument('-1', '--key', help='the first key to be output. optional - if not provided, the script will ask for input')
-parser.add_argument('-2', '--key2', help='the second key to be output. optional - if not provided, the script will ask for input')
-parser.add_argument('-i', '--handle', help='handle of the community to retreive. optional - if not provided, the script will ask for input')
-args = parser.parse_args()
-
-if args.key:
-    key = args.key
-else:
-    key = raw_input('Enter first key: ')
-if args.key2:
-    key2 = args.key2
-else:
-    key2 = raw_input('Enter second key: ')
-if args.handle:
-    handle = args.handle
-else:
-    handle = raw_input('Enter community handle: ')
-
-urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
-
-
-baseURL = secrets.baseURL
-email = secrets.email
-password = secrets.password
-filePath = secrets.filePath
-verify = secrets.verify
-skippedCollections = secrets.skippedCollections
-
-startTime = time.time()
-data = {'email':email,'password':password}
-header = {'content-type':'application/json','accept':'application/json'}
-session = requests.post(baseURL+'/rest/login', headers=header, verify=verify, params=data).cookies['JSESSIONID']
-cookies = {'JSESSIONID': session}
-headerFileUpload = {'accept':'application/json'}
-cookiesFileUpload = cookies
-status = requests.get(baseURL+'/rest/status', headers=header, cookies=cookies, verify=verify).json()
-print 'authenticated'
-
-endpoint = baseURL+'/rest/handle/'+handle
-community = requests.get(endpoint, headers=header, cookies=cookies, verify=verify).json()
-communityID = community['uuid']
-
-itemList = []
-endpoint = baseURL+'/rest/communities'
-collections = requests.get(baseURL+'/rest/communities/'+str(communityID)+'/collections', headers=header, cookies=cookies, verify=verify).json()
-for j in range (0, len (collections)):
-    collectionID = collections[j]['uuid']
-    print collectionID
-    if collectionID not in skippedCollections:
-        offset = 0
-        items = ''
-        while items != []:
-            items = requests.get(baseURL+'/rest/collections/'+str(collectionID)+'/items?limit=200&offset='+str(offset), headers=header, cookies=cookies, verify=verify)
-            while items.status_code != 200:
-                time.sleep(5)
-                items = requests.get(baseURL+'/rest/collections/'+str(collectionID)+'/items?limit=200&offset='+str(offset), headers=header, cookies=cookies, verify=verify)
-            items = items.json()
-            for k in range (0, len (items)):
-                itemID = items[k]['uuid']
-                itemList.append(itemID)
-            offset = offset + 200
-            print offset
-elapsedTime = time.time() - startTime
-m, s = divmod(elapsedTime, 60)
-h, m = divmod(m, 60)
-print 'Item list creation time: ','%d:%02d:%02d' % (h, m, s)
-
-valueList = []
-for number, itemID in enumerate(itemList):
-    itemsRemaining = len(itemList) - number
-    print 'Items remaining: ', itemsRemaining, 'ItemID: ', itemID
-    metadata = requests.get(baseURL+'/rest/items/'+str(itemID)+'/metadata', headers=header, cookies=cookies, verify=verify).json()
-    itemTuple = (itemID,)
-    tupleValue1 = ''
-    tupleValue2 = ''
-    for l in range (0, len (metadata)):
-        if metadata[l]['key'] == key:
-            metadataValue = metadata[l]['value'].encode('utf-8')
-            tupleValue1 = metadataValue
-        if metadata[l]['key'] == key2:
-            metadataValue = metadata[l]['value'].encode('utf-8')
-            tupleValue2 = metadataValue
-    itemTuple = itemTuple + (tupleValue1 , tupleValue2)
-    valueList.append(itemTuple)
-    print itemTuple
-print valueList
-
-elapsedTime = time.time() - startTime
-m, s = divmod(elapsedTime, 60)
-h, m = divmod(m, 60)
-print 'Value list creation time: ','%d:%02d:%02d' % (h, m, s)
-
-f=csv.writer(open(filePath+key+'-'+key2+'Values.csv', 'wb'))
-f.writerow(['itemID']+[key]+[key2])
-for i in range (0, len (valueList)):
-    f.writerow([valueList[i][0]]+[valueList[i][1]]+[valueList[i][2]])
-
-logout = requests.post(baseURL+'/rest/logout', headers=header, cookies=cookies, verify=verify)
-
-elapsedTime = time.time() - startTime
-m, s = divmod(elapsedTime, 60)
-h, m = divmod(m, 60)
-print 'Total script run time: ', '%d:%02d:%02d' % (h, m, s)
+import json
+import requests
+import secrets
+import csv
+import time
+import urllib3
+import argparse
+
+secretsVersion = input('To edit production server, enter the name of the secrets file: ')
+if secretsVersion != '':
+    try:
+        secrets = __import__(secretsVersion)
+        print('Editing Production')
+    except ImportError:
+        print('Editing Stage')
+else:
+    print('Editing Stage')
+
+parser = argparse.ArgumentParser()
+parser.add_argument('-1', '--key', help='the first key to be output. optional - if not provided, the script will ask for input')
+parser.add_argument('-2', '--key2', help='the second key to be output. optional - if not provided, the script will ask for input')
+parser.add_argument('-i', '--handle', help='handle of the community to retreive. optional - if not provided, the script will ask for input')
+args = parser.parse_args()
+
+if args.key:
+    key = args.key
+else:
+    key = input('Enter first key: ')
+if args.key2:
+    key2 = args.key2
+else:
+    key2 = input('Enter second key: ')
+if args.handle:
+    handle = args.handle
+else:
+    handle = input('Enter community handle: ')
+
+urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
+
+baseURL = secrets.baseURL
+email = secrets.email
+password = secrets.password
+filePath = secrets.filePath
+verify = secrets.verify
+skippedCollections = secrets.skippedCollections
+
+startTime = time.time()
+data = {'email':email,'password':password}
+header = {'content-type':'application/json','accept':'application/json'}
+session = requests.post(baseURL+'/rest/login', headers=header, verify=verify, params=data).cookies['JSESSIONID']
+cookies = {'JSESSIONID': session}
+headerFileUpload = {'accept':'application/json'}
+
+status = requests.get(baseURL+'/rest/status', headers=header, cookies=cookies, verify=verify).json()
+print('authenticated')
+
+endpoint = baseURL+'/rest/handle/'+handle
+community = requests.get(endpoint, headers=header, cookies=cookies, verify=verify).json()
+communityID = community['uuid']
+
+itemList = []
+endpoint = baseURL+'/rest/communities'
+collections = requests.get(baseURL+'/rest/communities/'+str(communityID)+'/collections', headers=header, cookies=cookies, verify=verify).json()
+for j in range (0, len (collections)):
+    collectionID = collections[j]['uuid']
+    print(collectionID)
+    if collectionID not in skippedCollections:
+        offset = 0
+        items = ''
+        while items != []:
+            items = requests.get(baseURL+'/rest/collections/'+str(collectionID)+'/items?limit=200&offset='+str(offset), headers=header, cookies=cookies, verify=verify)
+            while items.status_code != 200:
+                time.sleep(5)
+                items = requests.get(baseURL+'/rest/collections/'+str(collectionID)+'/items?limit=200&offset='+str(offset), headers=header, cookies=cookies, verify=verify)
+            items = items.json()
+            for k in range (0, len (items)):
+                itemID = items[k]['uuid']
+                itemList.append(itemID)
+            offset = offset + 200
+            print(offset)
+elapsedTime = time.time() - startTime
+m, s = divmod(elapsedTime, 60)
+h, m = divmod(m, 60)
+print('Item list creation time: ','%d:%02d:%02d' % (h, m, s))
+
+valueList = []
+for number, itemID in enumerate(itemList):
+    itemsRemaining = len(itemList) - number
+    print('Items remaining: ', itemsRemaining, 'ItemID: ', itemID)
+    metadata = requests.get(baseURL+'/rest/items/'+str(itemID)+'/metadata', headers=header, cookies=cookies, verify=verify).json()
+    itemTuple = (itemID,)
+    tupleValue1 = ''
+    tupleValue2 = ''
+    for l in range (0, len (metadata)):
+        if metadata[l]['key'] == key:
+            metadataValue = metadata[l]['value']
+            tupleValue1 = metadataValue
+        if metadata[l]['key'] == key2:
+            metadataValue = metadata[l]['value']
+            tupleValue2 = metadataValue
+    itemTuple = itemTuple + (tupleValue1 , tupleValue2)
+    valueList.append(itemTuple)
+    print(itemTuple)
+print(valueList)
+
+elapsedTime = time.time() - startTime
+m, s = divmod(elapsedTime, 60)
+h, m = divmod(m, 60)
+print('Value list creation time: ','%d:%02d:%02d' % (h, m, s))
+
+f=csv.writer(open(filePath+key+'-'+key2+'Values.csv', 'w'))
+f.writerow(['itemID']+[key]+[key2])
+for i in range (0, len (valueList)):
+    f.writerow([valueList[i][0]]+[valueList[i][1]]+[valueList[i][2]])
+
+logout = requests.post(baseURL+'/rest/logout', headers=header, cookies=cookies, verify=verify)
+
+elapsedTime = time.time() - startTime
+m, s = divmod(elapsedTime, 60)
+h, m = divmod(m, 60)
+print('Total script run time: ', '%d:%02d:%02d' % (h, m, s))