[tor-commits] [flashproxy/master] Make version number extraction compatible with Python 2.6.

dcf at torproject.org dcf at torproject.org
Sun Feb 2 01:55:49 UTC 2014


commit aa82bea89021bf75417920f86d972fc21ff09408
Author: David Fifield <david at bamsoftware.com>
Date:   Sat Feb 1 17:54:25 2014 -0800

    Make version number extraction compatible with Python 2.6.
---
 setup-common.py |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/setup-common.py b/setup-common.py
index bcfdb71..ffe7c33 100755
--- a/setup-common.py
+++ b/setup-common.py
@@ -25,7 +25,10 @@ import sys
 
 from setuptools import setup, find_packages
 
-version = subprocess.check_output(["sh", "version.sh"]).strip()
+p = subprocess.Popen(["sh", "version.sh"], stdout=subprocess.PIPE)
+output, _ = p.communicate()
+assert p.poll() == 0
+version = output.strip()
 
 setup(
     name = "flashproxy-common",



More information about the tor-commits mailing list