openstack/nova
Code Issues Proposed changes

Merge "Make available to build docs with python3"

Browse Source
This commit is contained in:
Jenkins
2016-05-26 17:24:02 +00:00
committed by Gerrit Code Review
parent b36eb99524 9053a4685b
commit 220439fcd6
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api-guide/source/conf.py
View File

@@ -88,7 +88,7 @@ gitsha = subprocess.Popen(
# source tree # source tree
pwd = subprocess.Popen( pwd = subprocess.Popen(
"pwd", stdout=subprocess.PIPE).communicate()[0].strip('\n') "pwd", stdout=subprocess.PIPE).communicate()[0].decode().strip('\n')
# html_context allows us to pass arbitrary values into the html template # html_context allows us to pass arbitrary values into the html template
html_context = {"pwd": pwd, html_context = {"pwd": pwd,

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

@@ -148,7 +148,7 @@ git_cmd = ["git", "log", "--pretty=format:'%ad, commit %h'", "--date=local",
"-n1"] "-n1"]
try: try:
html_last_updated_fmt = subprocess.Popen( html_last_updated_fmt = subprocess.Popen(
git_cmd, stdout=subprocess.PIPE).communicate()[0] git_cmd, stdout=subprocess.PIPE).communicate()[0].decode()
except Exception: except Exception:
warnings.warn('Cannot get last updated time from git repository. ' warnings.warn('Cannot get last updated time from git repository. '
'Not setting "html_last_updated_fmt".') 'Not setting "html_last_updated_fmt".')

4
doc/ext/support_matrix.py
View File

@@ -317,7 +317,7 @@ class SupportMatrixDirective(rst.Directive):
summaryhead.append(header) summaryhead.append(header)
# then one column for each hypervisor driver # then one column for each hypervisor driver
impls = matrix.targets.keys() impls = list(matrix.targets.keys())
impls.sort() impls.sort()
for key in impls: for key in impls:
target = matrix.targets[key] target = matrix.targets[key]
@@ -350,7 +350,7 @@ class SupportMatrixDirective(rst.Directive):
classes=["sp_feature_" + feature.status])) classes=["sp_feature_" + feature.status]))
# and then one column for each hypervisor driver # and then one column for each hypervisor driver
impls = matrix.targets.keys() impls = list(matrix.targets.keys())
impls.sort() impls.sort()
for key in impls: for key in impls:
target = matrix.targets[key] target = matrix.targets[key]

2
doc/source/conf.py
View File

@@ -197,7 +197,7 @@ git_cmd = ["git", "log", "--pretty=format:'%ad, commit %h'", "--date=local",
"-n1"] "-n1"]
try: try:
html_last_updated_fmt = subprocess.Popen( html_last_updated_fmt = subprocess.Popen(
git_cmd, stdout=subprocess.PIPE).communicate()[0] git_cmd, stdout=subprocess.PIPE).communicate()[0].decode()
except Exception: except Exception:
warnings.warn('Cannot get last updated time from git repository. ' warnings.warn('Cannot get last updated time from git repository. '
'Not setting "html_last_updated_fmt".') 'Not setting "html_last_updated_fmt".')