diff options
| author | Dave Walker (Daviey) <DaveWalker@ubuntu.com> | 2011-08-06 19:08:08 +0100 |
|---|---|---|
| committer | Dave Walker (Daviey) <DaveWalker@ubuntu.com> | 2011-08-06 19:08:08 +0100 |
| commit | 43548ac4b2bf93dd6e6b1d0cbbc340ae005b4dbf (patch) | |
| tree | 5dcf02ebbc9b93b4ea923a0c2364d3000c122aa5 /tools/eventlet-patch | |
| parent | 2e3b199005d16ee3e35cd6c71b8512628e3631bc (diff) | |
| parent | c5cff2f02e887e518744f42f5a21605398a301a4 (diff) | |
| download | nova-43548ac4b2bf93dd6e6b1d0cbbc340ae005b4dbf.tar.gz nova-43548ac4b2bf93dd6e6b1d0cbbc340ae005b4dbf.tar.xz nova-43548ac4b2bf93dd6e6b1d0cbbc340ae005b4dbf.zip | |
Merge with trunk, resolving merge conflict
Diffstat (limited to 'tools/eventlet-patch')
| -rw-r--r-- | tools/eventlet-patch | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/tools/eventlet-patch b/tools/eventlet-patch deleted file mode 100644 index c87c5f279..000000000 --- a/tools/eventlet-patch +++ /dev/null @@ -1,24 +0,0 @@ -# HG changeset patch -# User Soren Hansen <soren@linux2go.dk> -# Date 1297678255 -3600 -# Node ID 4c846d555010bb5a91ab4da78dfe596451313742 -# Parent 5b7e9946c79f005c028eb63207cf5eb7bb21d1c3 -Don't attempt to wrap GreenPipes in GreenPipe - -If the os module is monkeypatched, Python's standard subprocess module -will return greenio.GreenPipe instances for Popen objects' stdin, stdout, -and stderr attributes. However, eventlet.green.subprocess tries to wrap -these attributes in another greenio.GreenPipe, which GreenPipe refuses. - -diff -r 5b7e9946c79f -r 4c846d555010 eventlet/green/subprocess.py ---- a/eventlet/green/subprocess.py Sat Feb 05 13:05:05 2011 -0800 -+++ b/eventlet/green/subprocess.py Mon Feb 14 11:10:55 2011 +0100 -@@ -27,7 +27,7 @@ - # eventlet.processes.Process.run() method. - for attr in "stdin", "stdout", "stderr": - pipe = getattr(self, attr) -- if pipe is not None: -+ if pipe is not None and not type(pipe) == greenio.GreenPipe: - wrapped_pipe = greenio.GreenPipe(pipe, pipe.mode, bufsize) - setattr(self, attr, wrapped_pipe) - __init__.__doc__ = subprocess_orig.Popen.__init__.__doc__ |