Merge pull request #25009 from ccordoba12/restore-str-encoding

PR: Restore calling `str` with encoding in several places (Utils)

Author: ccordoba12

spyder/plugins/editor/widgets/main_widget.py

@@ -19,7 +19,6 @@
 from pathlib import Path
 import re
 import sys
-import time
 from typing import Dict, Optional
 import uuid
 
@@ -37,7 +36,6 @@
 from spyder.config.base import _, get_conf_path
 from spyder.plugins.editor.api.panel import Panel
 from spyder.utils import encoding, programs, sourcecode
-from spyder.utils.icon_manager import ima
 from spyder.utils.qthelpers import create_action, qbytearray_to_str
 from spyder.utils.misc import getcwd_or_home
 from spyder.widgets.findreplace import FindReplace
@@ -61,7 +59,6 @@
 from spyder.plugins.run.api import (
     RunContext, RunConfigurationMetadata, RunConfiguration,
     SupportedExtensionContexts, ExtendedContext)
-from spyder.widgets.mixins import BaseEditMixin
 from spyder.widgets.printer import SpyderPrinter, SpyderPrintPreviewDialog
 from spyder.widgets.simplecodeeditor import SimpleCodeEditor
 

spyder/utils/encoding.py

@@ -169,23 +169,26 @@ def decode(text, default_codec=None):
     try:
         if text.startswith(BOM_UTF8):
             # UTF-8 with BOM
-            return str(text[len(BOM_UTF8):]), 'utf-8-bom'
+            return str(text[len(BOM_UTF8) :], "utf-8"), "utf-8-bom"
         elif text.startswith(BOM_UTF16):
             # UTF-16 with BOM
-            return str(text[len(BOM_UTF16):]), 'utf-16'
+            return str(text[len(BOM_UTF16) :], "utf-16"), "utf-16"
         elif text.startswith(BOM_UTF32):
             # UTF-32 with BOM
-            return str(text[len(BOM_UTF32):]), 'utf-32'
+            return str(text[len(BOM_UTF32) :], "utf-32"), "utf-32"
+
         coding = get_coding(text, default_codec=default_codec)
         if coding:
             return str(text, coding), coding
     except (UnicodeError, LookupError):
         pass
+
     # Assume UTF-8
     try:
-        return str(text), 'utf-8-guessed'
+        return str(text, "utf-8"), "utf-8-guessed"
     except (UnicodeError, LookupError):
         pass
+
     # Assume Latin-1 (behaviour before 3.7.1)
     return str(text, "latin-1"), 'latin-1-guessed'