summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlingyongxu <lyxu@fiberhome.com>2017-06-09 18:04:12 +0800
committerlingyongxu <lyxu@fiberhome.com>2017-06-09 18:04:43 +0800
commit6a52a8456e936e9eb4af12a307fc0a103e8f4049 (patch)
treed7b5d097514d8adf03f1b7b17b933bd070ede60c
parent1e06a64d4e68630bd285eec14db23fd6ef0e8742 (diff)
Fix html_last_updated_fmt for Python3
html_last_updated_fmt option is interpreted as a byte string in python3, causing Sphinx build to break. This patch makes it utf-8 string. Change-Id: I21ff7fe4da885d590303105c311aa9792fdaef2a
Notes
Notes (review): Code-Review+1: rocky <haigang.xu@easystack.cn> Code-Review+1: Nguyen Van Trung <trungnv@vn.fujitsu.com> Code-Review+1: Rajat Sharma <rajat.sharma@nectechnologies.in> Code-Review+1: Dai Dang Van <daidv@vn.fujitsu.com> Code-Review+2: Samuel de Medeiros Queiroz <samueldmq@gmail.com> Workflow+1: Samuel de Medeiros Queiroz <samueldmq@gmail.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Fri, 23 Jun 2017 02:56:55 +0000 Reviewed-on: https://review.openstack.org/472619 Project: openstack/keystonemiddleware Branch: refs/heads/master
-rw-r--r--doc/source/conf.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/source/conf.py b/doc/source/conf.py
index a6eb2c4..323a030 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -161,8 +161,8 @@ html_static_path = ['_static']
161git_cmd = ["git", "log", "--pretty=format:'%ad, commit %h'", "--date=local", 161git_cmd = ["git", "log", "--pretty=format:'%ad, commit %h'", "--date=local",
162 "-n1"] 162 "-n1"]
163try: 163try:
164 html_last_updated_fmt = subprocess.Popen( 164 html_last_updated_fmt = subprocess.check_output(git_cmd).decode('utf-8')
165 git_cmd, stdout=subprocess.PIPE).communicate()[0] 165
166except Exception: 166except Exception:
167 warnings.warn('Cannot get last updated time from git repository. ' 167 warnings.warn('Cannot get last updated time from git repository. '
168 'Not setting "html_last_updated_fmt".') 168 'Not setting "html_last_updated_fmt".')