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 to make it consistent
with keystone [1]

[1] https://review.openstack.org/#/c/457142/

Change-Id: I126579da6cbdacfdbaed80ef968e43e0829e24e1
Closes-Bug:#1693670
This commit is contained in:
Vu Cong Tuan 2017-06-04 11:55:54 +07:00
parent 0906fb0424
commit 6cab792d78

View File

@ -154,8 +154,7 @@ modindex_common_prefix = ['keystoneauth1.']
git_cmd = ["git", "log", "--pretty=format:'%ad, commit %h'", "--date=local", git_cmd = ["git", "log", "--pretty=format:'%ad, commit %h'", "--date=local",
"-n1"] "-n1"]
try: try:
html_last_updated_fmt = subprocess.Popen( html_last_updated_fmt = subprocess.check_output(git_cmd).decode('utf-8')
git_cmd, stdout=subprocess.PIPE).communicate()[0]
except: except:
warnings.warn('Cannot get last updated time from git repository. ' warnings.warn('Cannot get last updated time from git repository. '
'Not setting "html_last_updated_fmt".') 'Not setting "html_last_updated_fmt".')