Make available to build docs with python3

On Ubuntu 16.04 a tox package is for python3 by default
and this causes errors in building docs in tox enviroment.

In these changes iterators are replaced with lists where it's needed.
Also external command calls result are decoded from bytes to unicode.

Change-Id: I88ef54405b4bc13c269bdda55ae8289676311ee1
This commit is contained in:
Andrey Volkov 2016-05-16 11:27:19 +03:00
parent 677594480e
commit 9053a4685b
4 changed files with 5 additions and 5 deletions

View File

@ -88,7 +88,7 @@ gitsha = subprocess.Popen(
# source tree
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 = {"pwd": pwd,

View File

@ -148,7 +148,7 @@ 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]
git_cmd, stdout=subprocess.PIPE).communicate()[0].decode()
except Exception:
warnings.warn('Cannot get last updated time from git repository. '
'Not setting "html_last_updated_fmt".')

View File

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

View File

@ -197,7 +197,7 @@ 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]
git_cmd, stdout=subprocess.PIPE).communicate()[0].decode()
except Exception:
warnings.warn('Cannot get last updated time from git repository. '
'Not setting "html_last_updated_fmt".')