Merge "Not use deprecated library function os.popen()"

This commit is contained in:
Jenkins 2016-03-15 15:46:18 +00:00 committed by Gerrit Code Review
commit a852872399

View File

@ -11,6 +11,7 @@
# All configuration values have a default; values that are commented out # All configuration values have a default; values that are commented out
# serve to show the default. # serve to show the default.
import subprocess
import sys import sys
import os import os
@ -129,8 +130,10 @@ html_static_path = ['_static']
# 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.
git_cmd = "git log --pretty=format:'%ad, commit %h' --date=local -n1" git_cmd = ["git", "log", "--pretty=format:'%ad, commit %h'", "--date=local",
html_last_updated_fmt = os.popen(git_cmd).read() "-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 # If true, SmartyPants will be used to convert quotes and dashes to
# typographically correct entities. # typographically correct entities.