Adding patch for webbrowser on macOS

rtv/terminal.py

@@ -13,6 +13,7 @@ import webbrowser
 import subprocess
 import curses.ascii
 from curses import textpad
+from multiprocessing import Process
 from contextlib import contextmanager
 from tempfile import NamedTemporaryFile
 
@@ -464,11 +465,12 @@ class Terminal(object):
         python webbrowser will try to determine the default to use based on
         your system.
 
-        For browsers requiring an X display, we call
-        webbrowser.open_new_tab(url) and redirect stdout/stderr to devnull.
-        This is a workaround to stop firefox from spewing warning messages to
-        the console. See http://bugs.python.org/issue22277 for a better
-        description of the problem.
+        For browsers requiring an X display, we open a new subprocess and
+        redirect stdout/stderr to devnull. This is a workaround to stop
+        BackgroundBrowsers (e.g. xdg-open, any BROWSER command ending in "&"),
+        from spewing warning messages to the console. See
+        http://bugs.python.org/issue22277 for a better description of the
+        problem.
 
         For console browsers (e.g. w3m), RTV will suspend and display the
         browser window within the same terminal. This mode is triggered either
@@ -479,36 +481,33 @@ class Terminal(object):
            headless
 
         There may be other cases where console browsers are opened (xdg-open?)
-        but are not detected here.
+        but are not detected here. These cases are still unhandled and will
+        probably be broken if we incorrectly assume that self.display=True.
         """
 
         if self.display:
-            # Note that we need to sanitize the url before inserting it into
-            # the python code to prevent injection attacks.
-            command = (
-                "import webbrowser\n"
-                "from six.moves.urllib.parse import unquote\n"
-                "webbrowser.open_new_tab(unquote('%s'))" % quote(url))
-            args = [sys.executable, '-c', command]
-            with self.loader('Opening page in a new window'), \
-                    open(os.devnull, 'ab+', 0) as null:
-                p = subprocess.Popen(args, stdout=null, stderr=null)
-                # Give the browser 5 seconds to open a new tab. Because the
+            with self.loader('Opening page in a new window'):
+
+                def open_url_silent(url):
+                    # This used to be done using subprocess.Popen().
+                    # It was switched to multiprocessing.Process so that we
+                    # can re-use the webbrowser instance that has been patched
+                    # by RTV. It's also safer because it doesn't inject
+                    # python code through the command line.
+                    null = open(os.devnull, 'ab+', 0)
+                    sys.stdout, sys.stderr = null, null
+                    webbrowser.open_new_tab(url)
+
+                p = Process(target=open_url_silent, args=(url,))
+                p.start()
+                # Give the browser 7 seconds to open a new tab. Because the
                 # display is set, calling webbrowser should be non-blocking.
                 # If it blocks or returns an error, something went wrong.
                 try:
-                    start = time.time()
-                    while time.time() - start < 10:
-                        code = p.poll()
-                        if code == 0:
-                            break  # Success
-                        elif code is not None:
-                            raise exceptions.BrowserError(
-                                'Program exited with status=%s' % code)
-                        time.sleep(0.01)
-                    else:
+                    p.join(7)
+                    if p.is_alive():
                         raise exceptions.BrowserError(
-                            'Timeout opening browser')
+                            'Timeout waiting for browser to open')
                 finally:
                     # Can't check the loader exception because the oauth module
                     # supersedes this loader and we need to always kill the