From d7c695114a24c7096ff4c8a2ff67d75eccb3edd7 Mon Sep 17 00:00:00 2001 From: ridiculousfish Date: Sat, 21 Sep 2019 12:04:21 -0700 Subject: [PATCH] Switch from subprocess.run to subprocess.check_call Restores Python 2 compatibility in conf.py --- sphinx_doc_src/conf.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sphinx_doc_src/conf.py b/sphinx_doc_src/conf.py index 4b067ecc0..6423f116b 100644 --- a/sphinx_doc_src/conf.py +++ b/sphinx_doc_src/conf.py @@ -53,9 +53,9 @@ author = "fish-shell developers" # Parsing FISH-BUILD-VERSION-FILE is possible but hard to ensure that it is in the right place # fish_indent is guaranteed to be on PATH for the Pygments highlighter anyway -ret = subprocess.run( - ("fish_indent", "--version"), stdout=subprocess.PIPE, stderr=subprocess.PIPE -).stderr.decode("utf-8") +ret = subprocess.check_output( + ("fish_indent", "--version"), stderr=subprocess.STDOUT +).decode("utf-8") # The full version, including alpha/beta/rc tags release = ret.strip().split(" ")[-1] # The short X.Y version