refactor: Replace deprecated smart_text with smart_str

Author: jennifer-richards

ietf/api/serializer.py

@@ -9,7 +9,7 @@
 from django.core.exceptions import ObjectDoesNotExist, FieldError
 from django.core.serializers.json import Serializer
 from django.http import HttpResponse
-from django.utils.encoding import smart_text
+from django.utils.encoding import smart_str
 from django.db.models import Field
 from django.db.models.query import QuerySet
 from django.db.models.signals import post_save, post_delete, m2m_changed
@@ -121,7 +121,7 @@ def end_object(self, obj):
         for name in expansions:
             try:
                 field = getattr(obj, name)
-                #self._current["_"+name] = smart_text(field)
+                #self._current["_"+name] = smart_str(field)
                 if not isinstance(field, Field):
                     options = self.options.copy()
                     options["expand"] = [ v[len(name)+2:] for v in options["expand"] if v.startswith(name+"__") ]
@@ -188,10 +188,10 @@ def handle_fk_field(self, obj, field):
                 related = related.natural_key()
             elif field.remote_field.field_name == related._meta.pk.name:
                 # Related to remote object via primary key
-                related = smart_text(related._get_pk_val(), strings_only=True)
+                related = smart_str(related._get_pk_val(), strings_only=True)
             else:
                 # Related to remote object via other field
-                related = smart_text(getattr(related, field.remote_field.field_name), strings_only=True)
+                related = smart_str(getattr(related, field.remote_field.field_name), strings_only=True)
         self._current[field.name] = related
 
     def handle_m2m_field(self, obj, field):
@@ -201,7 +201,7 @@ def handle_m2m_field(self, obj, field):
             elif self.use_natural_keys and hasattr(field.remote_field.to, 'natural_key'):
                 m2m_value = lambda value: value.natural_key()
             else:
-                m2m_value = lambda value: smart_text(value._get_pk_val(), strings_only=True)
+                m2m_value = lambda value: smart_str(value._get_pk_val(), strings_only=True)
             self._current[field.name] = [m2m_value(related)
                                for related in getattr(obj, field.name).iterator()]
 
@@ -264,6 +264,6 @@ def json_view(self, request, filter=None, expand=None):
             qd = dict( ( k, json.loads(v)[0] )  for k,v in items )
         except (FieldError, ValueError) as e:
             return HttpResponse(json.dumps({"error": str(e)}, sort_keys=True, indent=3), content_type=content_type)
-        text = json.dumps({smart_text(self.model._meta): qd}, sort_keys=True, indent=3)
+        text = json.dumps({smart_str(self.model._meta): qd}, sort_keys=True, indent=3)
         return HttpResponse(text, content_type=content_type)
 

ietf/doc/utils_charter.py

@@ -12,7 +12,7 @@
 from django.urls import reverse as urlreverse
 from django.template.loader import render_to_string
 from django.utils import timezone
-from django.utils.encoding import smart_text, force_str
+from django.utils.encoding import smart_str, force_str
 
 import debug                            # pyflakes:ignore
 
@@ -197,7 +197,7 @@ def derive_new_work_text(review_text,group):
                                            'Reply_to':'<iesg@ietf.org>'})
     if not addrs.cc:
         del m['Cc']
-    return smart_text(m.as_string())
+    return smart_str(m.as_string())
 
 def default_review_text(group, charter, by):
     now = timezone.now()

ietf/meeting/utils.py

@@ -15,7 +15,7 @@
 from django.contrib import messages
 from django.template.loader import render_to_string
 from django.utils import timezone
-from django.utils.encoding import smart_text
+from django.utils.encoding import smart_str
 
 import debug                            # pyflakes:ignore
 
@@ -699,7 +699,7 @@ def handle_upload_file(file, filename, meeting, subdir, request=None, encoding=N
                     )
             else:
                 try:
-                    text = smart_text(text)
+                    text = smart_str(text)
                 except UnicodeDecodeError as e:
                     return "Failure trying to save '%s'. Hint: Try to upload as UTF-8: %s..." % (filename, str(e)[:120])
             # Whole file sanitization; add back what's missing from a complete

ietf/utils/test_data.py

@@ -7,7 +7,7 @@
 from django.conf import settings
 from django.contrib.auth.models import User
 from django.utils import timezone
-from django.utils.encoding import smart_text
+from django.utils.encoding import smart_str
 
 import debug                            # pyflakes:ignore
 
@@ -38,7 +38,7 @@ def create_person(group, role_name, name=None, username=None, email_address=None
     user = User.objects.create(username=username,is_staff=is_staff,is_superuser=is_superuser)
     user.set_password(password)
     user.save()
-    person = Person.objects.create(name=name, ascii=unidecode_name(smart_text(name)), user=user)
+    person = Person.objects.create(name=name, ascii=unidecode_name(smart_str(name)), user=user)
     email = Email.objects.create(address=email_address, person=person, origin=user.username)
     Role.objects.create(group=group, name_id=role_name, person=person, email=email)
     return person