From daf75c2852846f88ca526c58258cdf10b07a5cf1 Mon Sep 17 00:00:00 2001 From: Sharat Sharma Date: Mon, 17 Apr 2017 16:09:59 +0530 Subject: [PATCH] Fix doc generation for python 3 The html_last_updated_fmt option is interpeted as a byte string in python3, make it utf-8 string. Change-Id: I7ba038ea1bca354681f973d68c06eb3c4bfa6e29 --- api-ref/source/conf.py | 4 ++-- doc/source/conf.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/api-ref/source/conf.py b/api-ref/source/conf.py index 88984828c..80973d283 100644 --- a/api-ref/source/conf.py +++ b/api-ref/source/conf.py @@ -99,8 +99,8 @@ modindex_common_prefix = ['mistral.'] # html_last_updated_fmt = '%b %d, %Y' git_cmd = ["git", "log", "--pretty=format:'%ad, commit %h'", "--date=local", "-n1"] -html_last_updated_fmt = subprocess.Popen( - git_cmd, stdout=subprocess.PIPE).communicate()[0] +html_last_updated_fmt = subprocess.check_output( + git_cmd).decode('utf-8') # The name for this set of Sphinx documents. If None, it defaults to # " v documentation". diff --git a/doc/source/conf.py b/doc/source/conf.py index 05e08ad45..67cdf37ce 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -100,8 +100,8 @@ modindex_common_prefix = ['mistral.'] 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] + html_last_updated_fmt = subprocess.check_output( + git_cmd).decode('utf-8') except Exception: warnings.warn('Cannot get last updated time from git repository. ' 'Not setting "html_last_updated_fmt".')