openstack/glance
Code Issues Proposed changes

Fix doc generation for Python3

Browse Source 
Fix the Sphinx html_last_updated_fmt for Python3.
The html_last_updated_fmt option is interpeted as a
byte string in python3, causing Sphinx build to break.
This patch makes it utf-8 string.

Change-Id: I2d79405579e55ae77c8f8e353a15c49474061e1e
This commit is contained in:
M V P Nitesh 2017-04-17 18:13:43 +05:30
parent 085f375a13
commit f615dd2a69
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

@ -166,8 +166,7 @@ git_cmd = [
"git", "log", "--pretty=format:'%ad, commit %h'", "--date=local", "-n1" "git", "log", "--pretty=format:'%ad, commit %h'", "--date=local", "-n1"
] ]
try: try:
html_last_updated_fmt = subprocess.Popen( html_last_updated_fmt = subprocess.check_output(git_cmd).decode('utf-8')
git_cmd, stdout=subprocess.PIPE).communicate()[0]
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".')

3
doc/source/conf.py
View File

@ -212,8 +212,7 @@ html_static_path = ['_static']
git_cmd = ["git", "log", "--pretty=format:'%ad, commit %h'", "--date=local", 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.check_output(git_cmd).decode('utf-8')
git_cmd, stdout=subprocess.PIPE).communicate()[0]
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".')