openstack
/
ec2-api
Code Issues Proposed changes

Merge "Fix html_last_updated_fmt for Python3"

This commit is contained in:
Jenkins 2017-06-04 07:16:05 +00:00 committed by Gerrit Code Review
parent 762b9d636b 5f1377bb94
commit 84e546f70c
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api-ref/source/conf.py
View File

@ -157,8 +157,7 @@ pygments_style = 'sphinx'
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()
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".')

3
doc/source/conf.py
View File

@ -65,8 +65,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".')