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

This commit is contained in:
Jenkins 2016-01-15 18:59:20 +00:00 committed by Gerrit Code Review
commit c17f6f525f

View File

@ -2,6 +2,7 @@
import datetime import datetime
import os import os
import subprocess
import sys import sys
sys.path.insert(0, os.path.abspath('../..')) sys.path.insert(0, os.path.abspath('../..'))
@ -70,8 +71,10 @@ html_static_path = ['static']
# Output file base name for HTML help builder. # Output file base name for HTML help builder.
htmlhelp_basename = '%sdoc' % project htmlhelp_basename = '%sdoc' % project
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]
# Grouping the document tree into LaTeX files. List of tuples # Grouping the document tree into LaTeX files. List of tuples
# (source start file, target name, title, author, documentclass # (source start file, target name, title, author, documentclass