Ship our own copy of subprocess.py

so people without the latest Python could run merge-recursive.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano
2005-09-19 19:47:54 -07:00
parent 0a2ba73860
commit 343d35c916
4 changed files with 1176 additions and 9 deletions

View File

@ -11,12 +11,6 @@ def printList(list, file=sys.stdout):
file.write(' ')
file.write('\n')
if sys.version_info[0] < 2 or \
(sys.version_info[0] == 2 and sys.version_info[1] < 4):
die('Python version 2.4 required, found', \
str(sys.version_info[0])+'.'+str(sys.version_info[1])+'.'+ \
str(sys.version_info[2]))
import subprocess
# Debugging machinery