Merge pull request #334 from michael-lazar/osx_display

Ignore OSX $DISPLAY variable, default to true. #166

rtv/terminal.py

@@ -93,15 +93,11 @@ class Terminal(object):
 
         if self._display is None:
             if sys.platform == 'darwin':
-                # OSX doesn't always set DISPLAY so we can't use this to check
-                # Note: Disabling for now, with the hope that if this
-                # is a widespread issue then people will complain and we can
-                # come up with a better solution. Checking for $DISPLAY is
-                # used extensively in mailcap files, so it really *should* be
-                # set properly. I don't have a mac anymore so I can't test.
-
-                #  display = True
-                display = bool(os.environ.get("DISPLAY"))
+                # OS X won't set $DISPLAY unless xQuartz is installed.
+                # If you're using OS X and you want to access a terminal
+                # browser, you need to set it manually via $BROWSER.
+                # See issue #166
+                display = True
             else:
                 display = bool(os.environ.get("DISPLAY"))
 

tests/test_terminal.py

@@ -38,7 +38,7 @@ def test_terminal_properties(terminal, config):
     with mock.patch('rtv.terminal.sys') as sys, \
             mock.patch.dict('os.environ', {'DISPLAY': ''}):
         sys.platform = 'darwin'
-        assert terminal.display is False
+        assert terminal.display is True
 
     terminal._display = None
     with mock.patch.dict('os.environ', {'DISPLAY': ':0', 'BROWSER': 'w3m'}):