From a496a6bae0f169736244aef078a259a936d99e63 Mon Sep 17 00:00:00 2001 From: Devananda van der Veen Date: Thu, 19 May 2016 10:52:23 -0700 Subject: [PATCH] Read the Sphinx html_last_updated_fmt option correctly in py3 The html_last_updated_fmt option is the output of a shell command, which is interpeted as a byte string in python 3 and subsequently breaks Sphinx. This change converts it to a utf-8 string. Incidentally, this also removes the quotation marks to make the formatted output cleaner. Change-Id: I9aa6446a24d2f340246458dea0c34d456b3eade3 Closes-bug: #1583721 --- api-ref/source/conf.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/api-ref/source/conf.py b/api-ref/source/conf.py index 599e64e2c3..6dfcca6814 100644 --- a/api-ref/source/conf.py +++ b/api-ref/source/conf.py @@ -143,10 +143,9 @@ pygments_style = 'sphinx' # If not '', a 'Last updated on:' timestamp is inserted at every page bottom, # using the given strftime format. # html_last_updated_fmt = '%b %d, %Y' -git_cmd = ["git", "log", "--pretty=format:'%ad, commit %h'", "--date=local", +git_cmd = ["git", "log", "--pretty=format:%ad, commit %h", "--date=local", "-n1"] -html_last_updated_fmt = subprocess.Popen( - git_cmd, stdout=subprocess.PIPE).communicate()[0] +html_last_updated_fmt = subprocess.check_output(git_cmd).decode('utf-8') # If true, SmartyPants will be used to convert quotes and dashes to # typographically correct entities.