import and use subprocess.py from python 2.6.

This should hopefully let us run even on python 2.3 on really old servers.
This commit is contained in:
Avery Pennarun
2010-10-01 12:06:56 -07:00
parent 7d3028dee2
commit da774f3f46
7 changed files with 1319 additions and 18 deletions

View File

@ -1,4 +1,5 @@
import struct, socket, select, subprocess, errno, re
import struct, socket, select, errno, re
import compat.ssubprocess as ssubprocess
import helpers, ssnet, ssh
from ssnet import SockWrapper, Handler, Proxy, Mux, MuxWrapper
from helpers import *
@ -45,7 +46,7 @@ class FirewallClient:
e = None
for argv in argv_tries:
try:
self.p = subprocess.Popen(argv, stdout=s1, preexec_fn=setup)
self.p = ssubprocess.Popen(argv, stdout=s1, preexec_fn=setup)
e = None
break
except OSError, e: