Merge branch 'django/4.2' into task/DES-2600--google-site-search

designsafe/apps/googledrive_integration/models.py

@@ -56,7 +56,7 @@ def get_prep_value(self, value):
         if value is None:
             return None
         else:
-            return encoding.smart_text(
+            return encoding.smart_str(
                 base64.b64encode(jsonpickle.encode(value).encode()))
 
     def value_to_string(self, obj):