From 6a59290ec335b0f9811725497e7cd4d0c02bccfd Mon Sep 17 00:00:00 2001 From: Vu Cong Tuan Date: Sun, 4 Jun 2017 12:32:48 +0700 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: Ia3e792c512da46c2b92d3ad9ec1657849d379052 --- doc/source/conf.py | 3 +-- placement-api-ref/source/conf.py | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/doc/source/conf.py b/doc/source/conf.py index 501ab34c4..84cf3186a 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -195,8 +195,7 @@ html_static_path = ['_static'] git_cmd = ["git", "log", "--pretty=format:'%ad, commit %h'", "--date=local", "-n1"] try: - html_last_updated_fmt = subprocess.Popen( - git_cmd, stdout=subprocess.PIPE).communicate()[0].decode() + 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".') diff --git a/placement-api-ref/source/conf.py b/placement-api-ref/source/conf.py index 73d1e01ed..80a4a5f96 100644 --- a/placement-api-ref/source/conf.py +++ b/placement-api-ref/source/conf.py @@ -156,8 +156,7 @@ pygments_style = 'sphinx' git_cmd = ["git", "log", "--pretty=format:'%ad, commit %h'", "--date=local", "-n1"] try: - html_last_updated_fmt = subprocess.Popen( - git_cmd, stdout=subprocess.PIPE).communicate()[0].decode() + 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".')