diff options
Diffstat (limited to 'mediagoblin/_compat.py')
| -rw-r--r-- | mediagoblin/_compat.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/mediagoblin/_compat.py b/mediagoblin/_compat.py index 9164d5fc..c992f44e 100644 --- a/mediagoblin/_compat.py +++ b/mediagoblin/_compat.py @@ -3,15 +3,12 @@ import warnings import six -if six.PY3: - from email.mime.text import MIMEText -else: - from email.MIMEText import MIMEText +from email.mime.text import MIMEText def encode_to_utf8(method): def wrapper(self): - if six.PY2 and isinstance(method(self), six.text_type): + if six.PY2 and isinstance(method(self), str): return method(self).encode('utf-8') return method(self) functools.update_wrapper(wrapper, method, ['__name__', '__doc__']) |