Improve if logic even moar

pallets-eco · May 20, 2024 · e2a674e · e2a674e
1 parent 1125b53
commit e2a674e
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/flask_mail.py b/flask_mail.py
@@ -52,12 +52,12 @@ def force_text(s, encoding="utf-8", errors="strict"):
         return s
 
     try:
-        if isinstance(s, bytes):
+        if isinstance(s, str):
+            s = s.decode(encoding, errors)
+        elif isinstance(s, bytes):
             s = str(s, encoding, errors)
-        elif not isinstance(s, str):
-            s = str(s)
         else:
-            s = s.decode(encoding, errors)
+            s = str(s)
     except UnicodeDecodeError as e:
         if not isinstance(s, Exception):
             raise FlaskMailUnicodeDecodeError(s, *e.args) from e