diff options
| author | Vu Cong Tuan <tuanvc@vn.fujitsu.com> | 2017-06-04 11:39:30 +0700 |
|---|---|---|
| committer | Vu Cong Tuan <tuanvc@vn.fujitsu.com> | 2017-06-06 09:54:12 +0700 |
| commit | d565cf1a0b61e930bcbeb06cfdc07edfabf28676 (patch) | |
| tree | 6ccd81783f9793fe8bfe78ebfca938a417d1c3a3 | |
| parent | cf0ee0b0c7a9fcbd9c3920613f679506c2fa957a (diff) | |
| download | taskflow-d565cf1a0b61e930bcbeb06cfdc07edfabf28676.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.
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: I6e9c2009f224abc282acbf957d7e999c7f87e9eb
| -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 c4e8864..98f84fb 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -75,8 +75,7 @@ htmlhelp_basename = '%sdoc' % project 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".') |