From 000d0ebeb5a0b5bc82cac4fe625e04b924636236 Mon Sep 17 00:00:00 2001 From: Ryan Williams Date: Wed, 3 Mar 2010 15:29:03 -0800 Subject: [PATCH] Thanks for the patch, Benoit. Fixes #45. --- AUTHORS | 1 + eventlet/green/os.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index f921e4e..4cac7f4 100644 --- a/AUTHORS +++ b/AUTHORS @@ -43,3 +43,4 @@ Thanks To * Cesar Alaniz, for uncovering bugs of great import * the grugq, for contributing patches, suggestions, and use cases * Ralf Schmitt, for wsgi/webob incompatibility bug report and suggested fix +* Benoit Chesneau, bug report on green.os and patch to fix it \ No newline at end of file diff --git a/eventlet/green/os.py b/eventlet/green/os.py index 2751ca1..01a1015 100644 --- a/eventlet/green/os.py +++ b/eventlet/green/os.py @@ -65,7 +65,7 @@ def waitpid(pid, options): waitpid(pid, options) -> (pid, status) Wait for completion of a given child process.""" - if options & os.WNOHANG != 0: + if options & os_orig.WNOHANG != 0: return __original_waitpid__(pid, options) else: new_options = options | os.WNOHANG