openstack/keystone
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Jenkins 2016-01-11 11:02:28 +00:00 committed by Gerrit Code Review
commit d446a4e297
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
doc/source/conf.py
View File

@ -24,8 +24,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 os import subprocess
# NOTE(dstanek): adds _ to the builtins so keystone modules can be imported # NOTE(dstanek): adds _ to the builtins so keystone modules can be imported
__builtins__['_'] = str __builtins__['_'] = str
@ -153,8 +152,10 @@ man_pages = [
# 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.
#html_last_updated_fmt = '%b %d, %Y' #html_last_updated_fmt = '%b %d, %Y'
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.