Changeset 34995

Timestamp:

2021-04-04T13:30:03+12:00 (3 years ago)

Author:

davidb

Message:

Updated to work with Python3

File:

• main/trunk/model-sites-dev/eurovision-lod/collect/eurovision/prepare/voting-excel/xlsxutil.py (modified) (4 diffs)

main/trunk/model-sites-dev/eurovision-lod/collect/eurovision/prepare/voting-excel/xlsxutil.py

@@ -141 +141 @@
 
 def load_xslx_sheet(excel_input_filename,sheetname):
-    print "Loading: " + excel_input_filename
-    print "  ..."
+    print("Loading: " + excel_input_filename)
+    print("  ...")
     workbook = openpyxl.load_workbook(excel_input_filename, data_only=True)
-    print "  ......Done"
-
-    print "  Loaded worksheets: ",  workbook.sheetnames
+    print("  ......Done")
+
+    print("  Loaded worksheets: " +  ",".join(workbook.sheetnames))
 
     worksheet = None
     
     if (sheetname == None):
-        print "  Selecting default/active worksheet"
+        print("  Selecting default/active worksheet")
         worksheet = workbook.active
     else:
-        print "  Selecting worksheet '"+sheetname+"'"
+        print("  Selecting worksheet '"+sheetname+"'")
         worksheet = workbook[sheetname]
 
-    print ""
+    print("")
     return worksheet
 
@@ -184 +184 @@
 def convert_worksheet_to_hashmaps(worksheet):
 
-    print "Converting worksheet to array header-name keyed array of hashmaps"
+    print("Converting worksheet to array header-name keyed array of hashmaps")
     
     data_hashmap_array = [];
@@ -203 +203 @@
         row_i = row_i + 1
      
-    print "  Found headername data in row: ", header_row_pos
+    print("  Found headername data in row: "+ str(header_row_pos))
         
     header_names_mapping = header_to_column_mapping(worksheet,header_row_pos)
@@ -234 +234 @@
         data_hashmap_array.append(data_hashmap)
 
-    print ""
+    print("")
     return data_hashmap_array