Cleaned up some of the dependencies, added conditional mailcap-fix dep

rtv/terminal.py

@@ -20,12 +20,17 @@ import six
 #pylint: disable=import-error
 from six.moves.urllib.parse import quote
 from kitchen.text.display import textual_width_chop
-from mailcap_fix import mailcap
 
 from . import exceptions
 from . import mime_parsers
 from .objects import LoadScreen, Color
 
+try:
+    # Fix only needed for versions prior to python 3.6
+    from mailcap_fix import mailcap
+except ImportError:
+    import mailcap
+
 try:
     # Added in python 3.4+
     from html import unescape