Merge branch 'master' into woorst-imgur_api

2017-07-25 00:54:19 -04:00
parent 578f03259b 72aed521a6
commit a852659f99
10 changed files with 3601 additions and 941 deletions
--- a/rtv/terminal.py
+++ b/rtv/terminal.py
@@ -59,7 +59,7 @@ class Terminal(object):
        self.loader = LoadScreen(self)
        self._display = None
        self._mailcap_dict = mailcap.getcaps()
-        self._term = os.environ['TERM']
+        self._term = os.environ.get('TERM')

        # This is a hack, the MIME parsers should be stateless
        # but we need to load the imgur credentials from the config