From 7e6500f85e6b5b244ff38d179519c8a488d24960 Mon Sep 17 00:00:00 2001 From: loooosy Date: Mon, 19 Jun 2017 11:27:58 +0800 Subject: [PATCH] Fix html_last_updated_fmt for Python3 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. Changing Popen to .check_output because of 3 reasons: 1. check_output() will raise CalledProcessError if the called process returns a non-zero return code. 2. For consistency with keystone [1] and cinder [2] 3. It makes the code look much better. [1] https://review.openstack.org/#/c/457142/ [2] https://review.openstack.org/#/c/433081 Change-Id: Ib7d6c25a22b70bd6210821a0784a1918049cc6d1 --- doc/source/conf.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/source/conf.py b/doc/source/conf.py index 6519a783..85a8e17b 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -124,8 +124,7 @@ html_theme = 'nature' # 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] +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.