Initial port to python3

[htsworkflow.git] / htsworkflow / frontend / eland_config / views.py

diff --git a/htsworkflow/frontend/eland_config/views.py b/htsworkflow/frontend/eland_config/views.py
index d21f86bb9d9995a9bb3dd1e69c08fe3ddc8a44d3..f63caf4e5b74e570b7425e27ec470b195388904d 100644 (file)
--- a/htsworkflow/frontend/eland_config/views.py
+++ b/htsworkflow/frontend/eland_config/views.py
@@ -273,7 +273,7 @@ def getElandConfig(flowcell, regenerate=False):
   #Convert all newline conventions to unix style
   for lane in fcObj.lane_set.all():
     data.append("# Lane%d: %s | %s" % \
-      (lane.lane_number, unicode(lane.library.id),  lane.library.library_name.replace('%', '%%')))
+      (lane.lane_number, str(lane.library.id),  lane.library.library_name.replace('%', '%%')))
   
   #data.append("GENOME_DIR %s" % (BASE_DIR))
   #data.append("CONTAM_DIR %s" % (BASE_DIR))
@@ -288,9 +288,9 @@ def getElandConfig(flowcell, regenerate=False):
   #l1s = form['lane1_species']
   for lane in fcObj.lane_set.all():
     species = lane.library.library_species.scientific_name
-    genome_dict.setdefault(species, []).append(unicode(lane.lane_number))
+    genome_dict.setdefault(species, []).append(str(lane.lane_number))
   
-  genome_list = genome_dict.keys()
+  genome_list = list(genome_dict.keys())
   genome_list.sort()
   
   #Loop through and create entries for each species.