Remove emails.compat module entirely

Move to_unicode, to_native, to_bytes, formataddr to emails.utils.
Replace all compat aliases with direct stdlib imports:
- string_types -> str
- text_type -> str
- is_callable -> callable()
- urlparse -> urllib.parse
- NativeStringIO/StringIO/BytesIO -> io
- OrderedDict -> collections

Delete emails/compat package and remove from setup.py.
All 74 tests pass.

Author: lavr

emails/compat/__init__.py

@@ -2,8 +2,9 @@
 import os.path
 from email.utils import formataddr
 
-from ..compat import to_unicode, to_native
-from ..compat import urlparse
+import urllib.parse as urlparse
+
+from ..utils import to_unicode, to_native
 from ..message import Message
 from ..utils import fetch_url
 from .local_store import (FileSystemLoader, ZipLoader, MsgLoader, FileNotFound)

emails/compat/_urlparse.py

@@ -13,7 +13,7 @@
 except ImportError:
     import chardet
 
-from ..compat import to_native, to_unicode
+from ..utils import to_native, to_unicode
 
 # HTML page charset stuff
 

emails/loader/__init__.py

@@ -9,11 +9,9 @@
 from zipfile import ZipFile
 import email
 
-from ..compat import to_unicode, string_types, to_native, formataddr as compat_formataddr
-
+from ..utils import to_unicode, to_native, formataddr, decode_header
 from ..loader.helpers import decode_text
 from ..message import Message
-from ..utils import decode_header
 
 class FileNotFound(Exception):
     pass
@@ -127,7 +125,7 @@ class FileSystemLoader(BaseLoader):
     """
 
     def __init__(self, searchpath, encoding='utf-8', base_path=None):
-        if isinstance(searchpath, string_types):
+        if isinstance(searchpath, str):
             searchpath = [searchpath]
         self.searchpath = list(searchpath)
         self.encoding = encoding
@@ -229,7 +227,7 @@ class MsgLoader(BaseLoader):
     common_charsets = ['ascii', 'utf-8', 'utf-16', 'windows-1252', 'cp850', 'windows-1251']
 
     def __init__(self, msg, base_path=None):
-        if isinstance(msg, string_types):
+        if isinstance(msg, str):
             self.msg = email.message_from_string(msg)
         elif isinstance(msg, bytes):
             self.msg = email.message_from_string(to_native(msg))
@@ -366,7 +364,7 @@ def decode_address_header_value(self, value, skip_invalid=False):
                 if not skip_invalid:
                     r.append(decode_header(email))
             else:
-                r.append(compat_formataddr([decode_header(name), email]))
+                r.append(formataddr([decode_header(name), email]))
 
         return r
 

emails/loader/helpers.py

@@ -2,8 +2,8 @@
 
 from email.utils import getaddresses
 
-from .compat import (string_types, is_callable, formataddr as compat_formataddr, to_unicode, to_native)
-from .utils import (SafeMIMEText, SafeMIMEMultipart, sanitize_address,
+from .utils import (formataddr, to_unicode, to_native,
+                    SafeMIMEText, SafeMIMEMultipart, sanitize_address,
                     parse_name_and_email, load_email_charsets,
                     encode_header as encode_header_,
                     renderable, format_date_header, parse_name_and_email_list,
@@ -156,9 +156,9 @@ def get_date(self):
         v = self._date
         if v is False:
             return None
-        if is_callable(v):
+        if callable(v):
             v = v()
-        if not isinstance(v, string_types):
+        if not isinstance(v, str):
             v = format_date_header(v)
         return v
 
@@ -170,7 +170,7 @@ def message_id(self):
         mid = self._message_id
         if mid is False:
             return None
-        return is_callable(mid) and mid() or mid
+        return callable(mid) and mid() or mid
 
     @message_id.setter
     def message_id(self, value):
@@ -210,7 +210,7 @@ def encode_address_header(self, pair):
         if not pair:
             return None
         name, email = pair
-        return compat_formataddr((name or '', email))
+        return formataddr((name or '', email))
 
     encode_name_header = encode_address_header  # legacy name
 
@@ -220,7 +220,7 @@ def set_header(self, msg, key, value, encode=True):
             # TODO: may be remove header here ?
             return
 
-        if not isinstance(value, string_types):
+        if not isinstance(value, str):
             value = to_unicode(value)
 
         # Prevent header injection

emails/loader/local_store.py

@@ -10,7 +10,7 @@
 from .packages import dkim
 from .packages.dkim import DKIMException, UnparsableKeyError
 from .packages.dkim.crypto import parse_pem_private_key
-from .compat import to_bytes, to_native
+from .utils import to_bytes, to_native
 
 
 class DKIMSigner:

emails/message.py

@@ -6,8 +6,9 @@
 from email.encoders import encode_base64
 from os.path import basename
 
-from ..compat import urlparse, string_types, to_bytes
-from ..utils import fetch_url, encode_header
+import urllib.parse as urlparse
+
+from ..utils import fetch_url, encode_header, to_bytes
 
 
 MIMETYPE_UNKNOWN = 'application/unknown'
@@ -50,7 +51,7 @@ def as_dict(self, fields=None):
 
     def get_data(self):
         _data = getattr(self, '_data', None)
-        if isinstance(_data, string_types):
+        if isinstance(_data, str):
             return _data
         elif hasattr(_data, 'read'):
             return _data.read()

emails/signers.py

@@ -1,7 +1,8 @@
 # encoding: utf-8
 from os.path import splitext
 
-from ..compat import OrderedDict, string_types
+from collections import OrderedDict
+
 from .file import BaseFile
 
 
@@ -22,7 +23,7 @@ def __init__(self, file_cls=None):
     def __contains__(self, k):
         if isinstance(k, self.file_cls):
             return k.uri in self._files
-        elif isinstance(k, string_types):
+        elif isinstance(k, str):
             return k in self._files
         else:
             return False
@@ -41,7 +42,7 @@ def remove(self, uri):
         if isinstance(uri, self.file_cls):
             uri = uri.uri
 
-        assert isinstance(uri, string_types)
+        assert isinstance(uri, str)
 
         v = self[uri]
         if v:

emails/store/file.py

@@ -3,7 +3,7 @@
 import email
 import datetime
 import os.path
-from emails.compat import to_native
+from emails.utils import to_native
 import emails.loader
 from emails.loader.local_store import MsgLoader