summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-02-21 21:19:10 +0000
committerGerrit Code Review <review@openstack.org>2014-02-21 21:19:10 +0000
commit52a94a8622c5349a83b212253611d9c53ec1cec1 (patch)
tree0e7c4e10b0c1d90c7b0b1829253d1932343e560f
parent38e5780d2673bd4a7be702ef787b68876cc6e4dc (diff)
parenta401295e9fafecab81f0aa9fbd57f82db81ec707 (diff)
downloadcliff-52a94a8622c5349a83b212253611d9c53ec1cec1.tar.gz
Merge "Fix doc build with Python 2.6.x"
-rw-r--r--docs/source/conf.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 131a9f9..f58e7b8 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -51,10 +51,8 @@ copyright = u'2012-%s, Doug Hellmann' % datetime.datetime.today().year
# built documents.
#
# The short X.Y version.
-version = subprocess.check_output([
- 'sh', '-c',
- 'cd ../..; python setup.py --version',
-])
+version = subprocess.Popen(['cd ../..; python setup.py --version'],
+ shell=True, stdout=subprocess.PIPE).stdout.read()
version = version.strip()
# The full version, including alpha/beta/rc tags.
release = version