X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=htsworkflow.git;a=blobdiff_plain;f=htsworkflow%2Ffrontend%2Fexperiments%2Fmodels.py;h=c29026883f3bf8c59512e42d0c54fd24f0945ec4;hp=7a41d3d5902aebe32a56595db04dd859aa6e016d;hb=refs%2Fheads%2Fpython3-django1.5;hpb=4262586d10cc0cc227390873b301b55244204c11

diff --git a/htsworkflow/frontend/experiments/models.py b/htsworkflow/frontend/experiments/models.py
index 7a41d3d..c290268 100644
--- a/htsworkflow/frontend/experiments/models.py
+++ b/htsworkflow/frontend/experiments/models.py
@@ -20,7 +20,7 @@ LOGGER = logging.getLogger(__name__)
 default_pM = 5
 try:
     default_pM = int(settings.DEFAULT_PM)
-except ValueError, e:
+except ValueError as e:
     LOGGER.error("invalid value for frontend.default_pm")
 
 # how many days to wait before trying to re-import a runfolder
@@ -54,7 +54,7 @@ class ClusterStation(models.Model):
         ordering = ["-isdefault", "name"]
 
     def __unicode__(self):
-        return unicode(self.name)
+        return str(self.name)
 
     @classmethod
     def default(cls):
@@ -93,9 +93,9 @@ class Sequencer(models.Model):
         ordering = ["-isdefault", "-active", "name"]
 
     def __unicode__(self):
-        name = [unicode(self.name)]
+        name = [str(self.name)]
         if self.instrument_name is not None:
-            name.append("(%s)" % (unicode(self.instrument_name),))
+            name.append("(%s)" % (str(self.instrument_name),))
         return " ".join(name)
 
     @models.permalink
@@ -150,7 +150,7 @@ class FlowCell(models.Model):
     notes = models.TextField(blank=True)
 
     def __unicode__(self):
-        return unicode(self.flowcell_id)
+        return str(self.flowcell_id)
 
     def Lanes(self):
         html = ['<table>']
@@ -184,9 +184,9 @@ class FlowCell(models.Model):
         """Convert our boolean 'is paired' flag to a name
         """
         if self.paired_end:
-            return u"Paired"
+            return "Paired"
         else:
-            return u"Single"
+            return "Single"
 
     @models.permalink
     def get_absolute_url(self):
@@ -304,7 +304,7 @@ class Lane(models.Model):
                 [str(self.id)])
 
     def __unicode__(self):
-        return self.flowcell.flowcell_id + ':' + unicode(self.lane_number)
+        return self.flowcell.flowcell_id + ':' + str(self.lane_number)
 
 
 class DataRun(models.Model):