diff options
| author | Vu Cong Tuan <tuanvc@vn.fujitsu.com> | 2017-06-04 11:28:48 +0700 |
|---|---|---|
| committer | Vu Cong Tuan <tuanvc@vn.fujitsu.com> | 2017-06-06 08:42:35 +0700 |
| commit | b456e923aeb14e0de131cc35a02d9e9b69c0145e (patch) | |
| tree | debd61cbbd24805234773b8036fd58f9cbf5f1f5 /doc | |
| parent | 9c6233f48c1e0ca855dd0a97b7e5cb65e2397dbc (diff) | |
| download | python-keystoneclient-b456e923aeb14e0de131cc35a02d9e9b69c0145e.tar.gz | |
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
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/source/conf.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/doc/source/conf.py b/doc/source/conf.py index cda0c77..a6f84e1 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -151,8 +151,7 @@ modindex_common_prefix = ['keystoneclient.'] 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] + 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".') |