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. Change-Id: I39e3cc70f51f9ebb2973ea5a7e6cb12d3b19d6cb Closes-Bug:#1693670
This commit is contained in:
parent
1755447b73
commit
5f1377bb94
|
@ -157,8 +157,7 @@ pygments_style = 'sphinx'
|
||||||
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".')
|
||||||
|
|
|
@ -65,8 +65,7 @@ htmlhelp_basename = '%sdoc' % project
|
||||||
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 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