diff options
| author | loooosy <syluo5695@fiberhome.com> | 2017-06-13 11:07:55 +0800 |
|---|---|---|
| committer | loooosy <syluo5695@fiberhome.com> | 2017-06-13 11:09:21 +0800 |
| commit | d94cdf8596747af7cce8dc972ff9cef9b4e7dff5 (patch) | |
| tree | b773f92ef9f88a7832861dc8eef51197959f8ee6 /doc | |
| parent | 6e420e9de5958dd27e6f1a38ef9bc578dde435a2 (diff) | |
| download | oslo-config-d94cdf8596747af7cce8dc972ff9cef9b4e7dff5.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: I8872866338d93bc8328391537198df6c7981859f
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 62b2119..6ffc86a 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -62,8 +62,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].decode('utf-8') + 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".') |