From 529e9aaaff656456c20c9da6b55a0232f89bc135 Mon Sep 17 00:00:00 2001
From: Luke Campagnola <luke.campagnola@gmail.com>
Date: Thu, 23 Jan 2014 13:25:00 -0500
Subject: [PATCH 1/3] py2.6 fix in setupHelpers

---
 tools/setupHelpers.py | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/tools/setupHelpers.py b/tools/setupHelpers.py
index 9e6be1d5..ea6aba3f 100644
--- a/tools/setupHelpers.py
+++ b/tools/setupHelpers.py
@@ -1,5 +1,16 @@
 import os, sys, re
-from subprocess import check_output
+try:
+    from subprocess import check_output
+except ImportError:
+    import subprocess as sp
+    def check_output(*args, **kwds):
+        kwds['stdout'] = sp.PIPE
+        proc = sp.Popen(*args, **kwds)
+        output = proc.stdout.read()
+        proc.wait()
+        if proc.returncode != 0:
+            raise Exception("Process had nonzero return value", proc.returncode)
+        return output
 
 def listAllPackages(pkgroot):
     path = os.getcwd()

From 2f6bd8de3713759612a4e7b05d4b5025d105306c Mon Sep 17 00:00:00 2001
From: Luke Campagnola <luke.campagnola@gmail.com>
Date: Thu, 23 Jan 2014 13:28:30 -0500
Subject: [PATCH 2/3] quiet setup.py warning about install_requires

---
 setup.py              | 5 +++++
 tools/setupHelpers.py | 1 +
 2 files changed, 6 insertions(+)

diff --git a/setup.py b/setup.py
index 16d66f61..7f2db6bf 100644
--- a/setup.py
+++ b/setup.py
@@ -37,6 +37,11 @@ setupOpts = dict(
 from distutils.core import setup
 import distutils.dir_util
 import os, sys, re
+try:
+    # just avoids warning about install_requires
+    import setuptools
+except ImportError:
+    pass
 
 path = os.path.split(__file__)[0]
 sys.path.insert(0, os.path.join(path, 'tools'))
diff --git a/tools/setupHelpers.py b/tools/setupHelpers.py
index ea6aba3f..ed13388e 100644
--- a/tools/setupHelpers.py
+++ b/tools/setupHelpers.py
@@ -2,6 +2,7 @@ import os, sys, re
 try:
     from subprocess import check_output
 except ImportError:
+    print "fake check_output"
     import subprocess as sp
     def check_output(*args, **kwds):
         kwds['stdout'] = sp.PIPE

From ba00ce530feab798779a0bde01bc645251a944e6 Mon Sep 17 00:00:00 2001
From: Luke Campagnola <luke.campagnola@gmail.com>
Date: Thu, 23 Jan 2014 13:32:20 -0500
Subject: [PATCH 3/3] remove print

---
 tools/setupHelpers.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tools/setupHelpers.py b/tools/setupHelpers.py
index ed13388e..ea6aba3f 100644
--- a/tools/setupHelpers.py
+++ b/tools/setupHelpers.py
@@ -2,7 +2,6 @@ import os, sys, re
 try:
     from subprocess import check_output
 except ImportError:
-    print "fake check_output"
     import subprocess as sp
     def check_output(*args, **kwds):
         kwds['stdout'] = sp.PIPE