diff options
| author | Andrew Donnellan <andrew.donnellan@au1.ibm.com> | 2017-06-07 18:12:21 +1000 |
|---|---|---|
| committer | Stewart Smith <stewart@linux.vnet.ibm.com> | 2017-06-07 19:20:20 +1000 |
| commit | b0809b89ecdf430c9f6e0272fb4cf0dc01a4989d (patch) | |
| tree | bf34919384b8a93af44534ae5c74c31623b217eb /doc | |
| parent | 55ccb8a4a9fe146d8e522dc9e1716a49fe1c7303 (diff) | |
| download | skiboot-b0809b89ecdf430c9f6e0272fb4cf0dc01a4989d.zip skiboot-b0809b89ecdf430c9f6e0272fb4cf0dc01a4989d.tar.gz skiboot-b0809b89ecdf430c9f6e0272fb4cf0dc01a4989d.tar.bz2 | |
doc: Fix output of version string when using Sphinx with Python 3
Our Sphinx configuration gets the current skiboot version by using the
subprocess module to run make_version.sh. In Python 2, this returns a
value of type str, but in Python 3, this returns bytes instead.
Decode those bytes into a string so we see "skiboot 5.6.blah" rather
than "skiboot b'5.6.blah\n'" in the documentation output.
Tested using Sphinx with both Python 2 and 3.
Signed-off-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com>
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/conf.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/conf.py b/doc/conf.py index fe37fbf..edd7f27 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -58,9 +58,9 @@ copyright = u'2016, Stewart Smith, IBM, others' # # The short X.Y version. import subprocess -version = subprocess.check_output("../make_version.sh | sed -e 's/skiboot-//'", shell=True) +version = subprocess.check_output("../make_version.sh | sed -e 's/skiboot-//'", shell=True).decode() # The full version, including alpha/beta/rc tags. -release = subprocess.check_output("../make_version.sh | sed -e 's/skiboot-//'", shell=True) +release = subprocess.check_output("../make_version.sh | sed -e 's/skiboot-//'", shell=True).decode() # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. |