Merge "Replace deprecated library function os.popen() with subprocess"

This commit is contained in:
Jenkins 2016-05-25 06:52:09 +00:00 committed by Gerrit Code Review
commit 76a0544c10
1 changed files with 8 additions and 3 deletions

View File

@ -12,6 +12,7 @@
# serve to show the default.
import datetime
import subprocess
import sys
import os
@ -128,8 +129,12 @@ html_theme = 'nature'
# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
# using the given strftime format.
git_cmd = "git log --pretty=format:'%ad, commit %h' --date=local -n1"
html_last_updated_fmt = os.popen(git_cmd).read()
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]
# If true, SmartyPants will be used to convert quotes and dashes to
# typographically correct entities.
@ -273,4 +278,4 @@ epub_copyright = u'2015, OpenStack Mistral Team'
#epub_tocdepth = 3
# Allow duplicate toc entries.
#epub_tocdup = True
#epub_tocdup = True