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

diff --git a/htsworkflow/frontend/inventory/models.py b/htsworkflow/frontend/inventory/models.py
index 46b37ec..3493891 100644
--- a/htsworkflow/frontend/inventory/models.py
+++ b/htsworkflow/frontend/inventory/models.py
@@ -11,7 +11,7 @@ LOGGER = logging.getLogger(__name__)
 
 try:
     import uuid
-except ImportError, e:
+except ImportError as e:
     # Some systems are using python 2.4, which doesn't have uuid
     # this is a stub
     LOGGER.warning('Real uuid is not available, initializing fake uuid module')
@@ -45,7 +45,7 @@ class Vendor(models.Model):
     url = models.URLField(blank=True, null=True)
 
     def __unicode__(self):
-        return u"%s" % (self.name)
+        return "%s" % (self.name)
 
 
 class Location(models.Model):
@@ -59,9 +59,9 @@ class Location(models.Model):
 
     def __unicode__(self):
         if len(self.location_description) > 16:
-            return u"%s: %s" % (self.name, self.location_description[0:16]+u"...")
+            return "%s: %s" % (self.name, self.location_description[0:16]+"...")
         else:
-            return u"%s: %s" % (self.name, self.location_description)
+            return "%s: %s" % (self.name, self.location_description)
 
 pre_save.connect(_assign_uuid, sender=Location)
 
@@ -82,15 +82,15 @@ class ItemInfo(models.Model):
     notes = models.TextField(blank=True, null=True)
 
     def __unicode__(self):
-        name = u''
+        name = ''
         if self.model_id:
-            name += u"model:%s " % (self.model_id)
+            name += "model:%s " % (self.model_id)
         if self.part_number:
-            name += u"part:%s " % (self.part_number)
+            name += "part:%s " % (self.part_number)
         if self.lot_number:
-            name += u"lot:%s " % (self.lot_number)
+            name += "lot:%s " % (self.lot_number)
 
-        return u"%s: %s" % (name, self.purchase_date)
+        return "%s: %s" % (name, self.purchase_date)
 
     class Meta:
         verbose_name_plural = "Item Info"
@@ -102,7 +102,7 @@ class ItemType(models.Model):
     description = models.TextField(blank=True, null=True)
 
     def __unicode__(self):
-        return u"%s" % (self.name)
+        return "%s" % (self.name)
 
 class ItemStatus(models.Model):
     name = models.CharField(max_length=64, unique=True)
@@ -140,9 +140,9 @@ class Item(models.Model):
 
     def __unicode__(self):
         if self.barcode_id is None or len(self.barcode_id) == 0:
-            return u"invu|%s" % (self.uuid)
+            return "invu|%s" % (self.uuid)
         else:
-            return u"invb|%s" % (self.barcode_id)
+            return "invb|%s" % (self.barcode_id)
 
     def get_absolute_url(self):
         return '/inventory/%s/' % (self.uuid)
@@ -163,9 +163,9 @@ class PrinterTemplate(models.Model):
 
     def __unicode__(self):
         if self.default:
-            return u'%s %s' % (self.item_type.name, self.printer.name)
+            return '%s %s' % (self.item_type.name, self.printer.name)
         else:
-            return u'%s %s (default)' % (self.item_type.name, self.printer.name)
+            return '%s %s (default)' % (self.item_type.name, self.printer.name)
 
 pre_save.connect(_switch_default, sender=PrinterTemplate)
 
@@ -181,7 +181,7 @@ class LongTermStorage(models.Model):
     modified_date = models.DateTimeField(auto_now=True)
 
     def __unicode__(self):
-        return u"%s: %s" % (str(self.flowcell), ', '.join([ str(s) for s in self.storage_devices.iterator() ]))
+        return "%s: %s" % (str(self.flowcell), ', '.join([ str(s) for s in self.storage_devices.iterator() ]))
 
     class Meta:
         verbose_name_plural = "Long Term Storage"
@@ -206,7 +206,7 @@ class ReagentFlowcell(ReagentBase):
     flowcell = models.ForeignKey(FlowCell)
 
     def __unicode__(self):
-        return u"%s: %s" % (str(self.flowcell), ', '.join([ str(s) for s in self.reagent.iterator() ]))
+        return "%s: %s" % (str(self.flowcell), ', '.join([ str(s) for s in self.reagent.iterator() ]))
 
 
 class ReagentLibrary(ReagentBase):
@@ -216,4 +216,4 @@ class ReagentLibrary(ReagentBase):
     library = models.ForeignKey(Library)
 
     def __unicode__(self):
-        return u"%s: %s" % (str(self.library), ', '.join([ str(s) for s in self.reagent.iterator() ]))
+        return "%s: %s" % (str(self.library), ', '.join([ str(s) for s in self.reagent.iterator() ]))