From f615dd2a69c189d00144400aa2f71f8c79b678cb Mon Sep 17 00:00:00 2001 From: M V P Nitesh Date: Mon, 17 Apr 2017 18:13:43 +0530 Subject: [PATCH] Fix doc generation for Python3 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 --- api-ref/source/conf.py | 3 +-- doc/source/conf.py | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/api-ref/source/conf.py b/api-ref/source/conf.py index 3a3cb5099d..26917f6b3b 100644 --- a/api-ref/source/conf.py +++ b/api-ref/source/conf.py @@ -166,8 +166,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] + 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".') diff --git a/doc/source/conf.py b/doc/source/conf.py index d651ec87f2..19f6e9dac6 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -212,8 +212,7 @@ html_static_path = ['_static'] 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".')