remove undefined symbols in mailer, thanks Hadi

Author: mdipierro

py4web/utils/auth_plugins/saml2_plugin.py

@@ -16,7 +16,7 @@ def obj2dict(obj, processed=None):
     processed = processed if processed is not None else set()
     if obj is None:
         return None
-    if isinstance(obj, (int, long, str, unicode, float, bool)):
+    if isinstance(obj, (int, str, bytes, float, bool)):
         return obj
     if id(obj) in processed:
         return "<reference>"

py4web/utils/form.py

@@ -1075,7 +1075,7 @@ def is_image(value):
         """
         if value:
             (_, extension) = os.path.splitext(value)
-            if extension in [".gif", ".png", ".jpg", ".jpeg",".webp", ".bmp"]:
+            if extension in [".gif", ".png", ".jpg", ".jpeg", ".webp", ".bmp"]:
                 return True
         return False
 

py4web/utils/mailer.py

@@ -15,6 +15,9 @@
 import smtplib
 from email import message_from_string
 from email.encoders import encode_base64
+from email.mime.multipart import MIMEMultipart
+from email.mime.text import MIMEText
+from email.mime.base import MIMEBase
 
 from pydal._compat import *
 
@@ -47,6 +50,31 @@ class Settings:
     pass
 
 
+def to_bytes(text, encoding="utf8"):
+    """Converts a text (str, bytes, file-like) to encoded bytes"""
+    # if the text is not a string or bytes, maybe it is a file
+    if not isinstance(text, (str, bytes)):
+        text = text.read()
+    # if it is a unicode string encode it
+    if isinstance(text, str):
+        text = text.encode("utf-8")
+    # if it is not a unicode string
+    elif isinstance(text, bytes) and encoding != "utf-8":
+        text = text.decode(encoding).encode("utf-8")
+    return text
+
+
+def to_unicode(text, encoding="utf8"):
+    """Converts a body (str, bytes, file-like) to unicode"""
+    # if the text is not a string or bytes, maybe it is a file
+    if not isinstance(text, (str, bytes)):
+        text = text.read()
+    # if it is a bytes string encode it
+    if isinstance(text, bytes):
+        text = text.decode(encoding)
+    return text
+
+
 class Mailer:
     """
     Class for configuring and sending emails with alternative text / html
@@ -379,15 +407,7 @@ def encoded_or_raw(text):
             # Use multipart/mixed if there is attachments
             payload_in = MIMEMultipart("mixed")
         elif raw:
-            # No encoding configuration for raw messages
-            if not isinstance(body, basestring):
-                body = body.read()
-            if isinstance(body, unicodeT):
-                text = body.encode("utf-8")
-            elif not encoding == "utf-8":
-                text = body.decode(encoding).encode("utf-8")
-            else:
-                text = body
+            text = to_bytes(body, encoding)
             # No charset passed to avoid transport encoding
             # NOTE: some unicode encoded strings will produce
             # unreadable mail contents.
@@ -421,19 +441,9 @@ def encoded_or_raw(text):
 
         if (text is not None or html is not None) and (not raw):
             if text is not None:
-                if not isinstance(text, basestring):
-                    text = text.read()
-                if isinstance(text, unicodeT):
-                    text = text.encode("utf-8")
-                elif not encoding == "utf-8":
-                    text = text.decode(encoding).encode("utf-8")
+                text = to_bytes(body, encoding)
             if html is not None:
-                if not isinstance(html, basestring):
-                    html = html.read()
-                if isinstance(html, unicodeT):
-                    html = html.encode("utf-8")
-                elif not encoding == "utf-8":
-                    html = html.decode(encoding).encode("utf-8")
+                html = to_bytes(html, encoding)
 
             # Construct mime part only if needed
             if text is not None and html:

py4web/utils/populate.py

@@ -8,7 +8,7 @@
 import sys
 import uuid
 
-from pydal._compat import pickle, unicodeT
+from pydal._compat import pickle
 
 IUP = {
     "ad": {"minim": 1},
@@ -223,7 +223,7 @@ def populate_generator(table, default=True, compute=False, contents=None, ell=No
                 continue  # if user supplied it, let it be.
 
             field = table[fieldname]
-            if not isinstance(field.type, (str, unicodeT)):
+            if not isinstance(field.type, str):
                 continue
             elif field.type == "id":
                 continue