summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-15 17:22:51 +0000
committerGerrit Code Review <review@openstack.org>2017-06-15 17:22:51 +0000
commitf786c9270e56ee260370b81f415d6f380cb01858 (patch)
tree5e477cc1fb361d9d923a87fa908dd9dc029edcb5
parent76550fa440e0cc7679d469882f173f64f8353d3c (diff)
parentf615dd2a69c189d00144400aa2f71f8c79b678cb (diff)
Merge "Fix doc generation for Python3"
-rw-r--r--api-ref/source/conf.py3
-rw-r--r--doc/source/conf.py3
2 files changed, 2 insertions, 4 deletions
diff --git a/api-ref/source/conf.py b/api-ref/source/conf.py
index 3a3cb50..26917f6 100644
--- a/api-ref/source/conf.py
+++ b/api-ref/source/conf.py
@@ -166,8 +166,7 @@ git_cmd = [
166 "git", "log", "--pretty=format:'%ad, commit %h'", "--date=local", "-n1" 166 "git", "log", "--pretty=format:'%ad, commit %h'", "--date=local", "-n1"
167] 167]
168try: 168try:
169 html_last_updated_fmt = subprocess.Popen( 169 html_last_updated_fmt = subprocess.check_output(git_cmd).decode('utf-8')
170 git_cmd, stdout=subprocess.PIPE).communicate()[0]
171except Exception: 170except Exception:
172 warnings.warn('Cannot get last updated time from git repository. ' 171 warnings.warn('Cannot get last updated time from git repository. '
173 'Not setting "html_last_updated_fmt".') 172 'Not setting "html_last_updated_fmt".')
diff --git a/doc/source/conf.py b/doc/source/conf.py
index d651ec8..19f6e9d 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -212,8 +212,7 @@ html_static_path = ['_static']
212git_cmd = ["git", "log", "--pretty=format:'%ad, commit %h'", "--date=local", 212git_cmd = ["git", "log", "--pretty=format:'%ad, commit %h'", "--date=local",
213 "-n1"] 213 "-n1"]
214try: 214try:
215 html_last_updated_fmt = subprocess.Popen( 215 html_last_updated_fmt = subprocess.check_output(git_cmd).decode('utf-8')
216 git_cmd, stdout=subprocess.PIPE).communicate()[0]
217except Exception: 216except Exception:
218 warnings.warn('Cannot get last updated time from git repository. ' 217 warnings.warn('Cannot get last updated time from git repository. '
219 'Not setting "html_last_updated_fmt".') 218 'Not setting "html_last_updated_fmt".')