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: I8d02c971d5b906ddbf58961c8544ecbcb9d01634
This commit is contained in:
parent
0a65b69f4e
commit
65586aa0d4
|
@ -176,8 +176,7 @@ html_static_path = ['_static']
|
||||||
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].decode()
|
|
||||||
except Exception:
|
except Exception:
|
||||||
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".')
|
||||||
|
|
Loading…
Reference in New Issue