use __str__() instead of __unicode__() (#38923)

passerelle/apps/base_adresse/models.py

@@ -389,6 +389,7 @@ class UnaccentNameMixin(object):
         super(UnaccentNameMixin, self).save(*args, **kwargs)
 
 
+@six.python_2_unicode_compatible
 class StreetModel(UnaccentNameMixin, models.Model):
 
     city = models.CharField(_('City'), max_length=150)
@@ -402,7 +403,7 @@ class StreetModel(UnaccentNameMixin, models.Model):
     class Meta:
         ordering = ['unaccent_name', 'name']
 
-    def __unicode__(self):
+    def __str__(self):
         return self.name
 
 

passerelle/apps/family/models.py

@@ -27,6 +27,7 @@ from collections import defaultdict
 
 from django.core.exceptions import ValidationError
 from django.core.files.storage import default_storage
+from django.utils import six
 from django.utils.translation import ugettext_lazy as _
 from django.http import Http404, HttpResponse
 from django.db import models, transaction
@@ -416,6 +417,7 @@ class Family(models.Model):
         return self.external_id
 
 
+@six.python_2_unicode_compatible
 class Person(models.Model):
     family = models.ForeignKey('Family', on_delete=models.CASCADE)
     external_id = models.CharField(_('Person\'s external id'), max_length=32,
@@ -434,7 +436,7 @@ class Person(models.Model):
     def fullname(self):
         return u'%s %s' % (self.first_name, self.last_name)
 
-    def __unicode__(self):
+    def __str__(self):
         return self.fullname
 
 

passerelle/apps/mdel/models.py

@@ -19,6 +19,7 @@ import os
 import json
 
 from django.db import models
+from django.utils import six
 from django.utils.translation import ugettext_lazy as _
 
 from passerelle.base.models import BaseResource
@@ -151,6 +152,7 @@ class MDEL(BaseResource):
                 if item.get('id') not in without.split(',')]}
 
 
+@six.python_2_unicode_compatible
 class Demand(models.Model):
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
@@ -162,7 +164,7 @@ class Demand(models.Model):
     step = models.IntegerField(default=0)
     demand_id = models.CharField(max_length=128, null=True)
 
-    def __unicode__(self):
+    def __str__(self):
         return '%s - %s - %s' % (self.resource.slug, self.demand_id, self.status)
 
     class Meta:

passerelle/base/models.py

@@ -19,6 +19,7 @@ from django.db.models import Q
 from django.test import override_settings
 from django.utils.text import slugify
 from django.utils import timezone, six
+from django.utils import six
 from django.utils.six.moves.urllib.parse import urlparse
 from django.utils.translation import ugettext_lazy as _
 from django.utils.timezone import now
@@ -43,6 +44,7 @@ KEYTYPE_CHOICES = (
     ('SIGN', _('HMAC Signature')),
 )
 
+@six.python_2_unicode_compatible
 class ApiUser(models.Model):
     username = models.CharField(max_length=128,
             verbose_name=_('Username'),
@@ -59,7 +61,7 @@ class ApiUser(models.Model):
     ipsource = models.GenericIPAddressField(blank=True, null=True, unpack_ipv4=True,
             verbose_name=_('IP Address'))
 
-    def __unicode__(self):
+    def __str__(self):
         return u'%s <%s>' % (self.fullname, self.username)
 
     def clean(self):
@@ -109,6 +111,7 @@ class InheritanceManager(ModelUtilsInheritanceManager):
         return self.filter(Q(users=None) | Q(users=apiuser))
 
 
+@six.python_2_unicode_compatible
 class BaseResource(models.Model):
     title = models.CharField(max_length=50, verbose_name=_('Title'))
     slug = models.SlugField(verbose_name=_('Identifier'), unique=True)
@@ -129,7 +132,7 @@ class BaseResource(models.Model):
         super(BaseResource, self).__init__(*args, **kwargs)
         self.logger = ProxyLogger(connector=self)
 
-    def __unicode__(self):
+    def __str__(self):
         return self.title
 
     def get_css_class_name(self):
@@ -565,6 +568,7 @@ class BaseResource(models.Model):
             exc_info=exc_info)
 
 
+@six.python_2_unicode_compatible
 class AccessRight(models.Model):
     codename = models.CharField(max_length=100, verbose_name='codename')
     resource_type = models.ForeignKey(ContentType, on_delete=models.CASCADE)
@@ -580,7 +584,7 @@ class AccessRight(models.Model):
             ('codename', 'resource_type', 'resource_pk', 'apiuser'),
         )
 
-    def __unicode__(self):
+    def __str__(self):
         return '%s (on %s <%s>) (for %s)' % (self.codename, self.resource_type, self.resource_pk, self.apiuser)
 
 
@@ -709,6 +713,7 @@ class Job(models.Model):
             self.after_timestamp = value
 
 
+@six.python_2_unicode_compatible
 class ResourceLog(models.Model):
     timestamp = models.DateTimeField(auto_now_add=True)
     appname = models.CharField(max_length=128, verbose_name='appname', null=True)
@@ -727,7 +732,7 @@ class ResourceLog(models.Model):
     def level(self):
         return slugify(logging.getLevelName(self.levelno))
 
-    def __unicode__(self):
+    def __str__(self):
         return '%s %s %s %s' % (self.timestamp, self.levelno, self.appname, self.slug)
 
 

passerelle/contrib/dpark/models.py

@@ -19,7 +19,7 @@ import json
 
 from django.conf import settings
 from django.db import models
-from django.utils import timezone
+from django.utils import six, timezone
 from django.utils.translation import ugettext_lazy as _
 from django.core.cache import cache
 
@@ -175,6 +175,7 @@ def get_client(instance):
     return instance.soap_client()
 
 
+@six.python_2_unicode_compatible
 class DPark(BaseResource):
     log_requests_errors = False
 
@@ -192,7 +193,7 @@ class DPark(BaseResource):
     class Meta:
         verbose_name = _('D-Park connector')
 
-    def __unicode__(self):
+    def __str__(self):
         return '%s - %s' % (self.slug, self.wsdl_url)
 
     def call(self, operation, *args, **kwargs):
@@ -483,6 +484,7 @@ class DPark(BaseResource):
         return {'data': True}
 
 
+@six.python_2_unicode_compatible
 class Pairing(models.Model):
     INFO_CACHE_DURATION = 5 * 60
     PAYMENT_INFO_CACHE_DURATION = 20 * 60
@@ -553,5 +555,5 @@ class Pairing(models.Model):
     class Meta:
         ordering = ['filenumber']
 
-    def __unicode__(self):
+    def __str__(self):
         return '%s - %s - %s' % (self.resource, self.nameid, self.filenumber)