openstack/ironic
Code Issues Proposed changes

Read the Sphinx html_last_updated_fmt option correctly in py3

Browse Source 
The html_last_updated_fmt option is the output of a shell command, which
is interpeted as a byte string in python 3 and subsequently breaks
Sphinx.

This change converts it to a utf-8 string.

Incidentally, this also removes the quotation marks to make the
formatted output cleaner.

Change-Id: I9aa6446a24d2f340246458dea0c34d456b3eade3
Closes-bug: #1583721
This commit is contained in:
Devananda van der Veen 2016-05-19 10:52:23 -07:00
parent bb42652d70
commit a496a6bae0
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -143,10 +143,9 @@ pygments_style = 'sphinx'
# If not '', a 'Last updated on:' timestamp is inserted at every page bottom, # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
# using the given strftime format. # using the given strftime format.
# html_last_updated_fmt = '%b %d, %Y' # html_last_updated_fmt = '%b %d, %Y'
git_cmd = ["git", "log", "--pretty=format:'%ad, commit %h'", "--date=local", git_cmd = ["git", "log", "--pretty=format:%ad, commit %h", "--date=local",
"-n1"] "-n1"]
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]
# If true, SmartyPants will be used to convert quotes and dashes to # If true, SmartyPants will be used to convert quotes and dashes to
# typographically correct entities. # typographically correct entities.