Merge pull request #3 from ehanson8/python3

Python 3 conversion

Author: ehanson8

.gitignore

@@ -56,6 +56,8 @@ local/*
 *.json
 createItemMetadataFromCSV_*
 *.txt
+Pipfile
+Pipfile.lock
 
 # Environments
 .env

addKeyValuePairOnHandleCSV.py

@@ -8,15 +8,15 @@
 
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 
-secretsVersion = raw_input('To edit production server, enter the name of the secrets file: ')
+secretsVersion = input('To edit production server, enter the name of the secrets file: ')
 if secretsVersion != '':
     try:
         secrets = __import__(secretsVersion)
-        print 'Editing Production'
+        print('Editing Production')
     except ImportError:
-        print 'Editing Stage'
+        print('Editing Stage')
 else:
-    print 'Editing Stage'
+    print('Editing Stage')
 
 baseURL = secrets.baseURL
 email = secrets.email
@@ -31,25 +31,25 @@
 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'
+print('authenticated')
 
-fileName = filePath+raw_input('Enter fileName (including \'.csv\'): ')
-addedKey = raw_input('Enter key: ')
+fileName = filePath+input('Enter fileName (including \'.csv\'): ')
+addedKey = input('Enter key: ')
 startTime = time.time()
 
-f=csv.writer(open(filePath+'addKeyValuePair'+datetime.now().strftime('%Y-%m-%d %H.%M.%S')+'.csv', 'wb'))
+f=csv.writer(open(filePath+'addKeyValuePair'+datetime.now().strftime('%Y-%m-%d %H.%M.%S')+'.csv', 'w'))
 f.writerow(['itemID']+['addedKey']+['addedValue']+['delete']+['post'])
 
 with open(fileName) as csvfile:
     reader = csv.DictReader(csvfile)
     for row in reader:
-        addedValue = row['value'].decode('utf-8')
+        addedValue = row['value']
         handle = row['handle'].strip()
         addedMetadataElement = {}
         addedMetadataElement['key'] = addedKey
-        addedMetadataElement['value'] = unicode(addedValue)
+        addedMetadataElement['value'] = addedValue
         addedMetadataElement['language'] = 'en_us'
         endpoint = baseURL+'/rest/handle/'+handle
         item = requests.get(endpoint, headers=header, cookies=cookies, verify=verify).json()
@@ -61,13 +61,13 @@
         provNote = '\''+addedKey+': '+addedValue+'\' was added through a batch process on '+datetime.now().strftime('%Y-%m-%d %H:%M:%S')+'.'
         provNoteElement = {}
         provNoteElement['key'] = 'dc.description.provenance'
-        provNoteElement['value'] = unicode(provNote)
+        provNoteElement['value'] = provNote
         provNoteElement['language'] = 'en_US'
         itemMetadataProcessed.append(provNoteElement)
 
         itemMetadataProcessed = json.dumps(itemMetadataProcessed)
         delete = requests.delete(baseURL+'/rest/items/'+str(itemID)+'/metadata', headers=header, cookies=cookies, verify=verify)
-        print delete
+        print(delete)
         post = requests.put(baseURL+'/rest/items/'+str(itemID)+'/metadata', headers=header, cookies=cookies, verify=verify, data=itemMetadataProcessed)
-        print post
-        f.writerow([itemID]+[addedMetadataElement['key']]+[addedMetadataElement['value'].encode('utf-8')]+[delete]+[post])
+        print(post)
+        f.writerow([itemID]+[addedMetadataElement['key']]+[addedMetadataElement['value']]+[delete]+[post])

addKeyValuePairToCollection.py

@@ -7,15 +7,15 @@
 import urllib3
 import argparse
 
-secretsVersion = raw_input('To edit production server, enter the name of the secrets file: ')
+secretsVersion = input('To edit production server, enter the name of the secrets file: ')
 if secretsVersion != '':
     try:
         secrets = __import__(secretsVersion)
-        print 'Editing Production'
+        print('Editing Production')
     except ImportError:
-        print 'Editing Stage'
+        print('Editing Stage')
 else:
-    print 'Editing Stage'
+    print('Editing Stage')
 
 parser = argparse.ArgumentParser()
 parser.add_argument('-k', '--key', help='the key to be added. optional - if not provided, the script will ask for input')
@@ -27,19 +27,19 @@
 if args.key:
     addedKey = args.key
 else:
-    addedKey = raw_input('Enter the key: ')
+    addedKey = input('Enter the key: ')
 if args.value:
     addedValue = args.value
 else:
-    addedValue = raw_input('Enter the value: ')
+    addedValue = input('Enter the value: ')
 if args.language:
     addedLanguage = args.language
 else:
-    addedLanguage = raw_input('Enter the language tag: ')
+    addedLanguage = input('Enter the language tag: ')
 if args.handle:
     handle = args.handle
 else:
-    handle = raw_input('Enter collection handle: ')
+    handle = input('Enter collection handle: ')
 
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 
@@ -56,9 +56,9 @@
 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'
+print('authenticated')
 
 itemList = []
 endpoint = baseURL+'/rest/handle/'+collectionHandle
@@ -79,14 +79,14 @@
 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)
+print('Item list creation time: ','%d:%02d:%02d' % (h, m, s))
 
 recordsEdited = 0
-f=csv.writer(open(filePath+'addKeyValuePair'+datetime.now().strftime('%Y-%m-%d %H.%M.%S')+'.csv', 'wb'))
+f=csv.writer(open(filePath+'addKeyValuePair'+datetime.now().strftime('%Y-%m-%d %H.%M.%S')+'.csv', 'w'))
 f.writerow(['itemID']+['addedKey']+['addedValue']+['delete']+['post'])
 for number, itemID in enumerate(itemList):
     itemsRemaining = len(itemList) - number
-    print 'Items remaining: ', itemsRemaining, 'ItemID: ', itemID
+    print('Items remaining: ', itemsRemaining, 'ItemID: ', itemID)
     metadata = requests.get(baseURL+'/rest/items/'+str(itemID)+'/metadata', headers=header, cookies=cookies, verify=verify).json()
     itemMetadataProcessed = []
     for l in range (0, len (metadata)):
@@ -96,27 +96,27 @@
         itemMetadataProcessed.append(metadata[l])
     addedMetadataElement = {}
     addedMetadataElement['key'] = addedKey
-    addedMetadataElement['value'] = unicode(addedValue)
-    addedMetadataElement['language'] = unicode(addedLanguage)
+    addedMetadataElement['value'] = addedValue
+    addedMetadataElement['language'] = addedLanguage
     itemMetadataProcessed.append(addedMetadataElement)
     provNote = '\''+addedKey+': '+addedValue+'\' was added through a batch process on '+datetime.now().strftime('%Y-%m-%d %H:%M:%S')+'.'
     provNoteElement = {}
     provNoteElement['key'] = 'dc.description.provenance'
-    provNoteElement['value'] = unicode(provNote)
+    provNoteElement['value'] = provNote
     provNoteElement['language'] = 'en_US'
     itemMetadataProcessed.append(provNoteElement)
     recordsEdited = recordsEdited + 1
     itemMetadataProcessed = json.dumps(itemMetadataProcessed)
-    print 'updated', itemID, recordsEdited
+    print('updated', itemID, recordsEdited)
     delete = requests.delete(baseURL+'/rest/items/'+str(itemID)+'/metadata', headers=header, cookies=cookies, verify=verify)
-    print delete
+    print(delete)
     post = requests.put(baseURL+'/rest/items/'+str(itemID)+'/metadata', headers=header, cookies=cookies, verify=verify, data=itemMetadataProcessed)
-    print post
+    print(post)
     f.writerow([itemID]+[addedKey]+[addedValue]+[delete]+[post])
 
 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)
+print('Total script run time: ', '%d:%02d:%02d' % (h, m, s))

addKeyValuePairToCommunity.py

@@ -7,15 +7,15 @@
 import urllib3
 import argparse
 
-secretsVersion = raw_input('To edit production server, enter the name of the secrets file: ')
+secretsVersion = input('To edit production server, enter the name of the secrets file: ')
 if secretsVersion != '':
     try:
         secrets = __import__(secretsVersion)
-        print 'Editing Production'
+        print('Editing Production')
     except ImportError:
-        print 'Editing Stage'
+        print('Editing Stage')
 else:
-    print 'Editing Stage'
+    print('Editing Stage')
 
 parser = argparse.ArgumentParser()
 parser.add_argument('-k', '--key', help='the key to be added. optional - if not provided, the script will ask for input')
@@ -27,19 +27,19 @@
 if args.key:
     addedKey = args.key
 else:
-    addedKey = raw_input('Enter the key: ')
+    addedKey = input('Enter the key: ')
 if args.value:
     addedValue = args.value
 else:
-    addedValue = raw_input('Enter the value: ')
+    addedValue = input('Enter the value: ')
 if args.language:
     addedLanguage = args.language
 else:
-    addedLanguage = raw_input('Enter the language tag: ')
+    addedLanguage = input('Enter the language tag: ')
 if args.handle:
     handle = args.handle
 else:
-    handle = raw_input('Enter community handle: ')
+    handle = input('Enter community handle: ')
 
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 
@@ -56,9 +56,9 @@
 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'
+print('authenticated')
 
 itemList = []
 endpoint = baseURL+'/rest/handle/'+handle
@@ -84,14 +84,14 @@
 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)
+print('Item list creation time: ','%d:%02d:%02d' % (h, m, s))
 
 recordsEdited = 0
-f=csv.writer(open(filePath+'addKeyValuePair'+datetime.now().strftime('%Y-%m-%d %H.%M.%S')+'.csv', 'wb'))
+f=csv.writer(open(filePath+'addKeyValuePair'+datetime.now().strftime('%Y-%m-%d %H.%M.%S')+'.csv', 'w'))
 f.writerow(['itemID']+['addedKey']+['addedValue']+['delete']+['post'])
 for number, itemID in enumerate(itemList):
     itemsRemaining = len(itemList) - number
-    print 'Items remaining: ', itemsRemaining, 'ItemID: ', itemID
+    print('Items remaining: ', itemsRemaining, 'ItemID: ', itemID)
     metadata = requests.get(baseURL+'/rest/items/'+str(itemID)+'/metadata', headers=header, cookies=cookies, verify=verify).json()
     itemMetadataProcessed = []
     changeRecord = True
@@ -105,27 +105,27 @@
     if changeRecord == True:
         addedMetadataElement = {}
         addedMetadataElement['key'] = addedKey
-        addedMetadataElement['value'] = unicode(addedValue)
-        addedMetadataElement['language'] = unicode(addedLanguage)
+        addedMetadataElement['value'] = addedValue
+        addedMetadataElement['language'] = addedLanguage
         itemMetadataProcessed.append(addedMetadataElement)
         provNote = '\''+addedKey+': '+addedValue+'\' was added through a batch process on '+datetime.now().strftime('%Y-%m-%d %H:%M:%S')+'.'
         provNoteElement = {}
         provNoteElement['key'] = 'dc.description.provenance'
-        provNoteElement['value'] = unicode(provNote)
+        provNoteElement['value'] = provNote
         provNoteElement['language'] = 'en_US'
         itemMetadataProcessed.append(provNoteElement)
         recordsEdited = recordsEdited + 1
         itemMetadataProcessed = json.dumps(itemMetadataProcessed)
-        print 'updated', itemID, recordsEdited
+        print('updated', itemID, recordsEdited)
         delete = requests.delete(baseURL+'/rest/items/'+str(itemID)+'/metadata', headers=header, cookies=cookies, verify=verify)
-        print delete
+        print(delete)
         post = requests.put(baseURL+'/rest/items/'+str(itemID)+'/metadata', headers=header, cookies=cookies, verify=verify, data=itemMetadataProcessed)
-        print post
+        print(post)
         f.writerow([itemID]+[addedKey]+[addedValue]+[delete]+[post])
 
 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)
+print('Total script run time: ', '%d:%02d:%02d' % (h, m, s))