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. In addition, changing Popen to check_output because check_output() will raise CalledProcessError if the called process returns a non-zero return code. It also makes the code look much better. Change-Id: If01f08216b4b252bd31029913e83fe945bf76866 Closes-Bug:#1693670
This commit is contained in:
parent
9c6233f48c
commit
b456e923ae
|
@ -151,8 +151,7 @@ modindex_common_prefix = ['keystoneclient.']
|
||||||
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(git_cmd,
|
html_last_updated_fmt = subprocess.check_output(git_cmd).decode('utf-8')
|
||||||
stdout=subprocess.PIPE).communicate()[0]
|
|
||||||
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