summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDirk Mueller <dirk@dmllr.de>2014-01-30 16:48:00 +0100
committerDirk Mueller <dirk@dmllr.de>2014-02-21 18:07:16 +0100
commita401295e9fafecab81f0aa9fbd57f82db81ec707 (patch)
tree3e3e5e01616cc131f6506a79fd6e93cd9a4ab153
parent5cf407a38bf3912dd405e522d6d16550f70987e9 (diff)
downloadcliff-a401295e9fafecab81f0aa9fbd57f82db81ec707.tar.gz
Fix doc build with Python 2.6.x
subprocess.check_output was new in Python 2.7. Use an alternative construct via subprocess.Popen which works on Python 2.6 as well. Change-Id: I0b44fc19183f1c6b23fe5a9cce31de381809534d
-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