[Skiboot] [PATCH] doc: Fix output of version string when using Sphinx with Python 3

Stewart Smith stewart at linux.vnet.ibm.com
Wed Jun 7 19:38:39 AEST 2017


Andrew Donnellan <andrew.donnellan at au1.ibm.com> writes:
> 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 at au1.ibm.com>
> ---
>  doc/conf.py | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

It even appears to work! Merged to master as of
b0809b89ecdf430c9f6e0272fb4cf0dc01a4989d



-- 
Stewart Smith
OPAL Architect, IBM.



More information about the Skiboot mailing list