aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/_compat.py
diff options
context:
space:
mode:
authorBen Sturmfels <ben@sturm.com.au>2021-03-05 23:12:19 +1100
committerBen Sturmfels <ben@sturm.com.au>2021-03-05 23:12:19 +1100
commitdec47c7102cf0aa3a4debf002928db8e460c0d71 (patch)
tree47631fc15c7af172aa699506adf3d76d3a71976c /mediagoblin/_compat.py
parent5f3a782fef4855e10b7259624a14d8afb0f7be93 (diff)
downloadmediagoblin-dec47c7102cf0aa3a4debf002928db8e460c0d71.tar.lz
mediagoblin-dec47c7102cf0aa3a4debf002928db8e460c0d71.tar.xz
mediagoblin-dec47c7102cf0aa3a4debf002928db8e460c0d71.zip
Apply `pyupgrade --py3-plus` to remove Python 2 compatibility code.
Diffstat (limited to 'mediagoblin/_compat.py')
-rw-r--r--mediagoblin/_compat.py7
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__'])