diff options
author | Frank Vanderham <fvanderham@ontracksconsulting.com> | 2018-04-22 14:14:23 -0600 |
---|---|---|
committer | Jelle van der Waa <jelle@vdwaa.nl> | 2019-01-21 21:19:58 +0100 |
commit | 0ca04132d084ad510662f4c64a4fa8ef92d289da (patch) | |
tree | cf393b260b4fbedd8f7013964a78c8d9cd89888a /packages | |
parent | 4dc419db90ee98ac5996f75c1bad8b99435a0302 (diff) | |
download | archweb-0ca04132d084ad510662f4c64a4fa8ef92d289da.tar.gz archweb-0ca04132d084ad510662f4c64a4fa8ef92d289da.zip |
Refactor Python 3 __unicode__ to __str__
In Python 3 for Django, class method __unicode__ must be changed to
__str__. This commit replaces all models that use __unicode__ to
__str__.
Diffstat (limited to 'packages')
-rw-r--r-- | packages/models.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/packages/models.py b/packages/models.py index 10808faa..a64a9e5a 100644 --- a/packages/models.py +++ b/packages/models.py @@ -41,7 +41,7 @@ class PackageRelation(models.Model): def last_update(self): return Update.objects.filter(pkgbase=self.pkgbase).latest() - def __unicode__(self): + def __str__(self): return '%s: %s (%s)' % ( self.pkgbase, self.user, self.get_type_display()) @@ -97,7 +97,7 @@ class SignoffSpecification(models.Model): return '%d:%s-%s' % (self.epoch, self.pkgver, self.pkgrel) return '%s-%s' % (self.pkgver, self.pkgrel) - def __unicode__(self): + def __str__(self): return '%s-%s' % (self.pkgbase, self.full_version) @@ -166,7 +166,7 @@ class Signoff(models.Model): return '%d:%s-%s' % (self.epoch, self.pkgver, self.pkgrel) return '%s-%s' % (self.pkgver, self.pkgrel) - def __unicode__(self): + def __str__(self): revoked = '' if self.revoked: revoked = ' (revoked)' @@ -220,7 +220,7 @@ class FlagRequest(models.Model): repo__staging=self.repo.staging).order_by( 'pkgname', 'repo__name', 'arch__name') - def __unicode__(self): + def __str__(self): return '%s from %s on %s' % (self.pkgbase, self.who(), self.created) @@ -342,7 +342,7 @@ class Update(models.Model): return '/packages/%s/%s/%s/' % (self.repo.name.lower(), self.arch.name, self.pkgname) - def __unicode__(self): + def __str__(self): return '%s of %s on %s' % (self.get_action_flag_display(), self.pkgname, self.created) @@ -355,7 +355,7 @@ class PackageGroup(models.Model): pkg = models.ForeignKey(Package, related_name='groups', on_delete=models.CASCADE) name = models.CharField(max_length=255, db_index=True) - def __unicode__(self): + def __str__(self): return "%s: %s" % (self.name, self.pkg) class Meta: @@ -366,7 +366,7 @@ class License(models.Model): pkg = models.ForeignKey(Package, related_name='licenses', on_delete=models.CASCADE) name = models.CharField(max_length=255) - def __unicode__(self): + def __str__(self): return self.name class Meta: @@ -455,7 +455,7 @@ class RelatedToBase(models.Model): x.repo.testing == self.pkg.repo.testing) return sorted(pkgs, key=key_func, reverse=True) - def __unicode__(self): + def __str__(self): if self.version: return '%s%s%s' % (self.name, self.comparison, self.version) return self.name @@ -479,9 +479,9 @@ class Depend(RelatedToBase): deptype = models.CharField(max_length=1, default='D', choices=DEPTYPE_CHOICES) - def __unicode__(self): + def __str__(self): '''For depends, we may also have a description and a modifier.''' - to_str = super(Depend, self).__unicode__() + to_str = super(Depend, self).__str__() if self.description: return '%s: %s' % (to_str, self.description) return to_str |