From d46714bdbe6ca2d9b15d955f8e653a66ea338e7a Mon Sep 17 00:00:00 2001 From: blue55 Date: Thu, 6 Jul 2017 10:46:03 +0800 Subject: [PATCH] Fix html_last_updated_fmt for Python3 Fix the Sphinx html_last_updated_fmt for Python3. The html_last_updated_fmt option is interpreted as a byte string in python3, causing Sphinx build to break. This patch makes it utf-8 string. Change-Id: I65fabcc43afe80cf30e4555e87d0251b24ab8c65 --- doc/source/conf.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/doc/source/conf.py b/doc/source/conf.py index 13ae04c..f12da21 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -126,9 +126,12 @@ man_pages = [] # If not '', a 'Last updated on:' timestamp is inserted at every page bottom, # using the given strftime format. 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] + "-n1"] +try: + html_last_updated_fmt = subprocess.check_output(git_cmd).decode('utf-8') +except Exception: + warnings.warn('Cannot get last updated time from git repository. ' + 'Not setting "html_last_updated_fmt".') # If true, SmartyPants will be used to convert quotes and dashes to # typographically correct entities.