Move away from smart_text and force_text legacy setup

Author: sei-vsarvepalli

bakery/management/commands/build.py

@@ -15,7 +15,7 @@
 # Filesystem
 from fs import path
 from fs import copy
-from django.utils.encoding import smart_str as smart_text
+from django.utils.encoding import smart_str
 
 # Pooling
 import multiprocessing
@@ -128,9 +128,9 @@ def set_options(self, *args, **options):
             self.build_dir = settings.BUILD_DIR
 
         # Get the datatypes right so fs will be happy
-        self.build_dir = smart_text(self.build_dir)
-        self.static_root = smart_text(settings.STATIC_ROOT)
-        self.media_root = smart_text(settings.MEDIA_ROOT)
+        self.build_dir = smart_str(self.build_dir)
+        self.static_root = smart_str(settings.STATIC_ROOT)
+        self.media_root = smart_str(settings.MEDIA_ROOT)
 
         # Connect the BUILD_DIR with our filesystem backend
         self.app = apps.get_app_config("bakery")
@@ -176,7 +176,7 @@ def build_static(self, *args, **options):
 
         # Set the target directory inside the filesystem.
         target_dir = path.join(self.build_dir, settings.STATIC_URL.lstrip("/"))
-        target_dir = smart_text(target_dir)
+        target_dir = smart_str(target_dir)
         if os.path.exists(self.static_root) and settings.STATIC_URL:
             if getattr(settings, "BAKERY_GZIP", False):
                 self.copytree_and_gzip(self.static_root, target_dir)
@@ -210,7 +210,7 @@ def build_media(self):
         if os.path.exists(self.media_root) and settings.MEDIA_URL:
             target_dir = path.join(self.build_dir, settings.MEDIA_URL.lstrip("/"))
             logger.debug("Copying {}{} to {}{}".format("osfs://", self.media_root, self.fs_name, target_dir))
-            copy.copy_dir("osfs:///", smart_text(self.media_root), self.fs, smart_text(target_dir))
+            copy.copy_dir("osfs:///", smart_str(self.media_root), self.fs, smart_str(target_dir))
 
     def get_view_instance(self, view):
         """
@@ -294,7 +294,7 @@ def copyfile_and_gzip(self, source_path, target_path):
                     "osfs://", source_path, self.fs_name, target_path
                 )
             )
-            copy.copy_file("osfs:///", smart_text(source_path), self.fs, smart_text(target_path))
+            copy.copy_file("osfs:///", smart_str(source_path), self.fs, smart_str(target_path))
 
         # # if the file is already gzipped
         elif encoding == "gzip":
@@ -303,7 +303,7 @@ def copyfile_and_gzip(self, source_path, target_path):
                     "osfs://", source_path, self.fs_name, target_path
                 )
             )
-            copy.copy_file("osfs:///", smart_text(source_path), self.fs, smart_text(target_path))
+            copy.copy_file("osfs:///", smart_str(source_path), self.fs, smart_str(target_path))
 
         # If it is one we want to gzip...
         else:
@@ -320,6 +320,6 @@ def copyfile_and_gzip(self, source_path, target_path):
                     f.write(six.binary_type(source_file.read()))
 
                 # Write that buffer out to the filesystem
-                with self.fs.open(smart_text(target_path), "wb") as outfile:
+                with self.fs.open(smart_str(target_path), "wb") as outfile:
                     outfile.write(data_buffer.getvalue())
                     outfile.close()

bakery/management/commands/publish.py

@@ -15,7 +15,7 @@
 from fs import copy
 from fs_s3fs import S3FS
 from fs.copy import copy_file
-from django.utils.encoding import smart_str as smart_text
+from django.utils.encoding import smart_str
 
 from django.apps import apps
 
@@ -223,7 +223,7 @@ def set_options(self, options):
             # Go ahead and use it
             self.build_dir = settings.BUILD_DIR
 
-        self.build_dir = smart_text(self.build_dir)
+        self.build_dir = smart_str(self.build_dir)
 
         # Connect the BUILD_DIR with our filesystem backend
         self.app = apps.get_app_config("bakery")
@@ -295,7 +295,7 @@ def get_local_file_list(self):
 
                 local_key = path.combine(path.frombase(path.abspath(self.build_dir), dirpath), fname.name)
                 local_key = path.relpath(local_key)
-                file_list.append(smart_text(local_key))
+                file_list.append(smart_str(local_key))
         return file_list
 
     def sync_with_s3(self):

bakery/views/base.py

@@ -14,7 +14,7 @@
 from fs import path
 from django.apps import apps
 from django.conf import settings
-from django.utils.encoding import smart_str as smart_text
+from django.utils.encoding import smart_str
 from bakery import DEFAULT_GZIP_CONTENT_TYPES
 from django.test.client import RequestFactory
 from bakery.management.commands import get_s3_client
@@ -76,7 +76,7 @@ def write_file(self, target_path, html):
         Writes out the provided HTML to the provided path.
         """
         logger.debug("Building to {}{}".format(self.fs_name, target_path))
-        with self.fs.open(smart_text(target_path), "wb") as outfile:
+        with self.fs.open(smart_str(target_path), "wb") as outfile:
             outfile.write(six.binary_type(html))
             outfile.close()
 
@@ -114,7 +114,7 @@ def gzip_file(self, target_path, html):
             f.write(six.binary_type(html))
 
         # Write that buffer out to the filesystem
-        with self.fs.open(smart_text(target_path), "wb") as outfile:
+        with self.fs.open(smart_str(target_path), "wb") as outfile:
             outfile.write(data_buffer.getvalue())
             outfile.close()
 

cogauth/backend.py

@@ -49,7 +49,7 @@
 from vinny.models import VinceAPIToken
 from rest_framework import exceptions
 from rest_framework.authentication import BaseAuthentication, TokenAuthentication, get_authorization_header
-from django.utils.encoding import smart_str as smart_text
+from django.utils.encoding import smart_str
 from django.utils.translation import gettext as _
 from bigvince.utils import get_cognito_url, get_cognito_pool_url
 import traceback
@@ -443,7 +443,7 @@ def authenticate(self, request):
     def get_jwt_token(self, request):
         logger.debug(f"Collected headers for JSONWwebToken as {request.headers}")
         auth = get_authorization_header(request).split()
-        if not auth or smart_text(auth[0].lower()) != "bearer":
+        if not auth or smart_str(auth[0].lower()) != "bearer":
             return None
 
         if len(auth) == 1:

vince/forms.py

@@ -55,7 +55,7 @@
 from vince.permissions import get_user_gen_queue
 import traceback
 import os
-from django.utils.encoding import smart_str as smart_text
+from django.utils.encoding import smart_str
 
 logger = logging.getLogger(__name__)
 logger.setLevel(logging.DEBUG)
@@ -562,7 +562,7 @@ def save(self):
         logger.debug("IN FILE UPLOAD SAVE")
         # create the vincecommattachment
         if file.size:
-            filename = smart_text(file.name)
+            filename = smart_str(file.name)
             logger.debug(filename)
             try:
                 mime_type = file.content_type

vince/lib.py

@@ -48,7 +48,7 @@
 from django.core.files import File
 from django.core.serializers.json import DjangoJSONEncoder
 from django.utils import timezone
-from django.utils.encoding import smart_str as smart_text
+from django.utils.encoding import smart_str
 from django.template.loader import render_to_string, get_template
 from vince.models import VulnerabilityCase
 
@@ -287,7 +287,7 @@ def process_attachments(followup, attached_files):
     for attached in attached_files:
         logger.debug(attached)
         if attached.size:
-            filename = smart_text(attached.name)
+            filename = smart_str(attached.name)
             logger.debug(filename)
             try:
                 mime_type = attached.content_type

vinny/forms.py

@@ -41,7 +41,7 @@
 from django.core.exceptions import ValidationError
 import mimetypes
 import os
-from django.utils.encoding import smart_str as smart_text
+from django.utils.encoding import smart_str
 from vinny.settings import DEFAULT_USER_SETTINGS
 from django.urls import reverse, reverse_lazy
 import base64
@@ -591,7 +591,7 @@ def save(self, commit=True):
         file = self.cleaned_data["attachment"]
 
         if file.size:
-            filename = smart_text(file.name)
+            filename = smart_str(file.name)
             logger.debug(filename)
             try:
                 mime_type = file.content_type
@@ -636,7 +636,7 @@ def save(self, commit=True):
         file = self.cleaned_data["attachment"]
 
         if file.size:
-            filename = smart_text(file.name)
+            filename = smart_str(file.name)
             logger.debug(filename)
             try:
                 mime_type = file.content_type

vinny/models.py

@@ -48,7 +48,7 @@
 from django.utils.functional import cached_property
 from vinny.mailer import send_newmessage_mail
 from bigvince.storage_backends import PrivateMediaStorage, SharedMediaStorage
-from django.utils.encoding import smart_str as smart_text
+from django.utils.encoding import smart_str
 from lib.vince.m2crypto_encrypt_decrypt import ED
 import base64
 import os
@@ -1820,7 +1820,7 @@ def attach_file(cls, message, file):
         """
 
         if file.size:
-            filename = smart_text(file.name)
+            filename = smart_str(file.name)
             logger.debug(filename)
             try:
                 mime_type = file.content_type