Replace all instances of unicode only handling to use force_text.

Replace all __unicode__ methods to __str__ and the
@python_2_unicode_compatible decorator.
Replace all instance of smart_str, smart_unicode, force_uncode
with force_text.

Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
This commit is contained in:
Roberto Rosario
2017-07-05 15:03:24 -04:00
parent 95157460cb
commit 6c6ca38374
47 changed files with 150 additions and 106 deletions

View File

@@ -3,7 +3,7 @@ from __future__ import unicode_literals
from django.db import models
from django.db.models import Q
from django.template import Context, Template
from django.utils.encoding import python_2_unicode_compatible
from django.utils.encoding import force_text, python_2_unicode_compatible
from django.utils.translation import ugettext_lazy as _
from documents.models import Document, DocumentType
@@ -43,7 +43,9 @@ class SmartLink(models.Model):
return template.render(context=context)
except Exception as exception:
return _(
'Error generating dynamic label; %s' % unicode(exception)
'Error generating dynamic label; %s' % force_text(
exception
)
)
else:
return None