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__.

6 files changed, 24 insertions, 24 deletions

diff --git a/devel/models.py b/devel/models.py
index b5300d07..6ed9ac0f 100644
--- a/devel/models.py
+++ b/devel/models.py
@@ -73,7 +73,7 @@ class StaffGroup(models.Model):
     class Meta:
         ordering = ('sort_order',)
 
-    def __unicode__(self):
+    def __str__(self):
         return self.name
 
     def get_absolute_url(self):
@@ -94,7 +94,7 @@ class MasterKey(models.Model):
         ordering = ('created',)
         get_latest_by = 'created'
 
-    def __unicode__(self):
+    def __str__(self):
         return '%s, created %s' % (
                 self.owner.get_full_name(), self.created)
 
@@ -109,7 +109,7 @@ class DeveloperKey(models.Model):
     revoked = models.DateTimeField(null=True, blank=True)
     parent = models.ForeignKey('self', null=True, on_delete=models.SET_NULL)
 
-    def __unicode__(self):
+    def __str__(self):
         return self.key
 
 
@@ -127,7 +127,7 @@ class PGPSignature(models.Model):
         get_latest_by = 'created'
         verbose_name = 'PGP signature'
 
-    def __unicode__(self):
+    def __str__(self):
         return '%s → %s' % (self.signer, self.signee)
 
 
diff --git a/mirrors/models.py b/mirrors/models.py
index 4215d872..1f27f30a 100644
--- a/mirrors/models.py
+++ b/mirrors/models.py
@@ -38,7 +38,7 @@ class Mirror(models.Model):
     class Meta:
         ordering = ('name',)
 
-    def __unicode__(self):
+    def __str__(self):
         return self.name
 
     def downstream(self):
@@ -60,7 +60,7 @@ class MirrorProtocol(models.Model):
             help_text="Included by default when building mirror list?")
     created = models.DateTimeField(editable=False)
 
-    def __unicode__(self):
+    def __str__(self):
         return self.protocol
 
     class Meta:
@@ -84,7 +84,7 @@ class MirrorUrl(models.Model):
     class Meta:
         verbose_name = 'mirror URL'
 
-    def __unicode__(self):
+    def __str__(self):
         return self.url
 
     def address_families(self):
@@ -127,7 +127,7 @@ class MirrorRsync(models.Model):
     mirror = models.ForeignKey(Mirror, related_name="rsync_ips", on_delete=models.CASCADE)
     created = models.DateTimeField(editable=False)
 
-    def __unicode__(self):
+    def __str__(self):
         return unicode(self.ip)
 
     class Meta:
@@ -145,7 +145,7 @@ class CheckLocation(models.Model):
     class Meta:
         ordering = ('hostname', 'source_ip')
 
-    def __unicode__(self):
+    def __str__(self):
         return self.hostname
 
     @property
@@ -182,7 +182,7 @@ class MirrorLog(models.Model):
             return timedelta()
         return self.check_time - self.last_sync
 
-    def __unicode__(self):
+    def __str__(self):
         return "Check of %s at %s" % (self.url.url, self.check_time)
 
     class Meta:
diff --git a/news/models.py b/news/models.py
index b413d17b..7e321f70 100644
--- a/news/models.py
+++ b/news/models.py
@@ -25,7 +25,7 @@ class News(models.Model):
     def html(self):
         return mark_safe(parse_markdown(self.content, not self.safe_mode))
 
-    def __unicode__(self):
+    def __str__(self):
         return self.title
 
     class Meta:
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
diff --git a/releng/models.py b/releng/models.py
index afa0094b..c99052d3 100644
--- a/releng/models.py
+++ b/releng/models.py
@@ -30,7 +30,7 @@ class Release(models.Model):
         get_latest_by = 'release_date'
         ordering = ('-release_date', '-version')
 
-    def __unicode__(self):
+    def __str__(self):
         return self.version
 
     def get_absolute_url(self):
diff --git a/todolists/models.py b/todolists/models.py
index 0627f833..b219ad6d 100644
--- a/todolists/models.py
+++ b/todolists/models.py
@@ -20,7 +20,7 @@ class Todolist(models.Model):
     class Meta:
         get_latest_by = 'created'
 
-    def __unicode__(self):
+    def __str__(self):
         return self.name
 
     @property
@@ -72,7 +72,7 @@ class TodolistPackage(models.Model):
         unique_together = (('todolist', 'pkgname', 'arch'),)
         get_latest_by = 'created'
 
-    def __unicode__(self):
+    def __str__(self):
         return self.pkgname
 
     def status_css_class(self):