From 6786cdf036b4faabe3928c3d0dd9615d94834801 Mon Sep 17 00:00:00 2001 From: Harshada Mangesh Kakad Date: Thu, 31 Dec 2015 01:44:00 -0800 Subject: [PATCH] Fixing the deprecated library function. os.popen() is deprecated since version 2.6. Resolved with use of subprocess module. Change-Id: I4409cdd9edbc1a26d6f99c125c9100fadda5d758 Partial-Bug: #1529836 --- doc/source/conf.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/doc/source/conf.py b/doc/source/conf.py index 5d2fbd304d..7dd61d33b8 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -13,9 +13,10 @@ # All configuration values have a default; values that are commented out # serve to show the default. -import sys -import os import datetime +import os +import subprocess +import sys # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -144,8 +145,10 @@ modindex_common_prefix = ['swift.'] # If not '', a 'Last updated on:' timestamp is inserted at every page bottom, # using the given strftime format. #html_last_updated_fmt = '%b %d, %Y' -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.