RCS file: /project/ci/cvsroot/v5/src/tools/test_sshd/win32eventreactor.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
|
|
|
|
| 197 | 197 | |
| 198 | 198 | doIteration = doWaitForMultipleEvents |
| 199 | 199 | |
| 200 | | def spawnProcess(self, processProtocol, executable, args=(), env={}, path=None, usePTY=0): |
| | 200 | def spawnProcess(self, processProtocol, executable, args=(), env=None, path=None, usePTY=0): |
| 201 | 201 | """Spawn a process.""" |
| 202 | 202 | Process(self, processProtocol, executable, args, env, path) |
| 203 | 203 | |
| … |
… |
|
| 242 | 242 | |
| 243 | 243 | buffer = '' |
| 244 | 244 | |
| 245 | | def __init__(self, reactor, protocol, command, args, environment, path): |
| | 245 | def __init__(self, reactor, protocol, command, args, env, path): |
| 246 | 246 | self.reactor = reactor |
| 247 | 247 | self.protocol = protocol |
| 248 | 248 | |
| … |
… |
|
| 277 | 277 | win32file.CloseHandle(self.hStdinW) |
| 278 | 278 | self.hStdinW = tmp |
| 279 | 279 | |
| 280 | | # Add the specified environment to the current environment - this is |
| 281 | | # necessary because certain operations are only supported on Windows |
| 282 | | # if certain environment variables are present. |
| 283 | | env = os.environ.copy() |
| 284 | | env.update(environment or {}) |
| | 280 | if env is None: |
| | 281 | env = os.environ |
| 285 | 282 | |
| 286 | 283 | # create the process |
| 287 | 284 | cmdline = ' '.join([_cmdLineQuote(a) for a in args]) |
