Replace hacky functions with html2text library for automatic HTML to …

…Text conversion when only HTML is provided in the email message

mailshake/__init__.py

@@ -71,4 +71,4 @@
 
 Mailer = ToConsoleMailer
 
-__version__ = '0.11.2'
+__version__ = '0.12.0'

mailshake/mailers/smtp.py

@@ -2,15 +2,19 @@
 """
     SMTP mailer.
 """
-import smtplib
-import ssl
-import threading
+try:
+    import smtplib
+    import ssl
+    import threading
+except ImportError:
+    pass
 
 from .base import BaseMailer
 from ..utils import sanitize_address, DNS_NAME
 
 
 class SMTPMailer(BaseMailer):
+
     """A wrapper that manages the SMTP network connection.
     """
 

mailshake/message.py

@@ -10,11 +10,14 @@
 import mimetypes
 import os
 
+import html2text
+
 from . import _compat as compat
-from .html2text import extract_text_from_html
 from .utils import forbid_multi_line_headers, make_msgid
 
 
+textify = html2text.HTML2Text()
+
 # Don't BASE64-encode UTF-8 messages
 email.charset.add_charset('utf-8', email.charset.SHORTEST, None, 'utf-8')
 utf8_charset = email.charset.Charset('utf-8')
@@ -26,6 +29,7 @@
 
 
 class MIMEMixin(object):
+
     def as_string(self, unixfrom=False):
         """Return the entire formatted message as a string.
         Optional `unixfrom' when True, means include the Unix From_ envelope
@@ -85,8 +89,10 @@ def __setitem__(self, name, val):
 
 
 class EmailMessage(object):
+
     """A container for email information.
     """
+
     content_subtype = 'plain'
     mixed_subtype = 'mixed'
     html_subtype = 'html'
@@ -135,7 +141,7 @@ def __init__(self, subject='', text='', from_email=None, to=None,
         text = compat.force_text(text or text_content or '')
         html = compat.force_text(html or html_content or '')
         if html and not text:
-            text = extract_text_from_html(html)
+            text = textify.handle(html)
         self.text = text
         self.html = html
 

requirements.txt

@@ -0,0 +1 @@
+html2text