MIRRORS/layerindex-web
1
0
Fork 0
mirror of git://git.yoctoproject.org/layerindex-web.git synced 2025-07-19 20:59:01 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

rrs: fix model string representations for Python 3

Browse Source 
__unicode__ doesn't work anymore, we need to use __str__ for models
instead.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
This commit is contained in:
Paul Eggleton 2018-02-28 11:40:06 +13:00
parent 252578e26d
commit edb1261d2b
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
rrs/models.py
View File

@ -53,7 +53,7 @@ class Release(models.Model):
return current_release or Release.objects.filter().order_by('-end_date')[0] return current_release or Release.objects.filter().order_by('-end_date')[0]
def __unicode__(self): def __str__(self):
return '%s' % (self.name) return '%s' % (self.name)
class Milestone(models.Model): class Milestone(models.Model):
@ -152,7 +152,7 @@ class Milestone(models.Model):
return weeks return weeks
def __unicode__(self): def __str__(self):
return '%s%s' % (self.release.name, self.name) return '%s%s' % (self.release.name, self.name)
class Maintainer(models.Model): class Maintainer(models.Model):
@ -180,7 +180,7 @@ class Maintainer(models.Model):
class Meta: class Meta:
ordering = ["name"] ordering = ["name"]
def __unicode__(self): def __str__(self):
return "%s <%s>" % (self.name, self.email) return "%s <%s>" % (self.name, self.email)
class RecipeMaintainerHistory(models.Model): class RecipeMaintainerHistory(models.Model):
@ -213,7 +213,7 @@ class RecipeMaintainerHistory(models.Model):
else: else:
return None return None
def __unicode__(self): def __str__(self):
return "%s: %s, %s" % (self.date, self.author.name, self.sha1[:10]) return "%s: %s, %s" % (self.date, self.author.name, self.sha1[:10])
class RecipeMaintainer(models.Model): class RecipeMaintainer(models.Model):
@ -231,7 +231,7 @@ class RecipeMaintainer(models.Model):
else: else:
return None return None
def __unicode__(self): def __str__(self):
return "%s: %s <%s>" % (self.recipe.pn, self.maintainer.name, return "%s: %s <%s>" % (self.recipe.pn, self.maintainer.name,
self.maintainer.email) self.maintainer.email)
@ -268,7 +268,7 @@ class RecipeUpstreamHistory(models.Model):
else: else:
return None return None
def __unicode__(self): def __str__(self):
return '%s: %s' % (self.id, self.start_date) return '%s: %s' % (self.id, self.start_date)
class RecipeUpstream(models.Model): class RecipeUpstream(models.Model):
@ -336,7 +336,7 @@ class RecipeUpstream(models.Model):
else: else:
return False return False
def __unicode__(self): def __str__(self):
return '%s: (%s, %s, %s)' % (self.recipe.pn, self.status, return '%s: (%s, %s, %s)' % (self.recipe.pn, self.status,
self.version, self.date) self.version, self.date)
@ -345,7 +345,7 @@ class RecipeDistro(models.Model):
distro = models.CharField(max_length=100, blank=True) distro = models.CharField(max_length=100, blank=True)
alias = models.CharField(max_length=100, blank=True) alias = models.CharField(max_length=100, blank=True)
def __unicode__(self): def __str__(self):
return '%s: %s' % (self.recipe.pn, self.distro) return '%s: %s' % (self.recipe.pn, self.distro)
@staticmethod @staticmethod
@ -381,7 +381,7 @@ class RecipeUpgrade(models.Model):
web_interface_url = self.recipe.layerbranch.layer.vcs_web_url web_interface_url = self.recipe.layerbranch.layer.vcs_web_url
return web_interface_url + "/commit/?id=" + self.sha1 return web_interface_url + "/commit/?id=" + self.sha1
def __unicode__(self): def __str__(self):
return '%s: (%s, %s)' % (self.recipe.pn, self.version, return '%s: (%s, %s)' % (self.recipe.pn, self.version,
self.commit_date) self.commit_date)