summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRonny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>2010-08-05 23:42:33 +0200
committerRonny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>2010-08-05 23:42:33 +0200
commit653bf6ef38cfb0b643f3576a65c2300becebeb8b (patch)
treedd79b02262a3fd3ae3ed930649108c074c29f4a4
parentc9875ae63b6465f9449148a6d525e9a572c4fa9a (diff)
downloadsetuptools-scm-653bf6ef38cfb0b643f3576a65c2300becebeb8b.tar.gz
kill the python2 invoke insanity after realizing the hg executable was using env python
-rw-r--r--hgdistver.py4
-rw-r--r--test_hgdistver.py10
2 files changed, 2 insertions, 12 deletions
diff --git a/hgdistver.py b/hgdistver.py
index 4d8d253..13a7d5e 100644
--- a/hgdistver.py
+++ b/hgdistver.py
@@ -10,9 +10,7 @@ def getoutput(cmd, cwd='.'):
out, _ = p.communicate()
return out.decode() # will kill us sometimes
-hg_prefix = 'python2 -c "from mercurial import dispatch;dispatch.run()" '
-if sys.platform == 'win32':
- hg_prefix = 'hg '
+hg_prefix = 'hg '
def hg(args, cwd='.'):
return getoutput(hg_prefix + args, cwd)
diff --git a/test_hgdistver.py b/test_hgdistver.py
index 79268d9..519ca86 100644
--- a/test_hgdistver.py
+++ b/test_hgdistver.py
@@ -35,17 +35,9 @@ class sbrepo(object):
def _hg(self, *args):
import sys
- if sys.platform == 'win32':
- prefix = ['hg']
- else:
- prefix = [
- 'python2', '-c',
- 'from mercurial import dispatch;dispatch.run()'
- ]
return call(
- prefix + [str(arg) for arg in args],
+ ['hg'] + [str(arg) for arg in args],
cwd=str(self.path),
- shell=True,
)
def join(self, name):