Skip to content

Commit eb706bd

Browse files
committed
fix crash in some rare eventlet edge cases
Closes: #70
1 parent 175f426 commit eb706bd

File tree

1 file changed

+5
-11
lines changed

1 file changed

+5
-11
lines changed

src/manhole/__init__.py

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -40,19 +40,13 @@ class BrokenPipeError(Exception):
4040
setinterval = sys.setcheckinterval
4141
getinterval = sys.getcheckinterval
4242

43-
try:
43+
if "eventlet" in sys.modules:
4444
from eventlet.patcher import original as _original
45-
45+
elif "gevent" in sys.modules:
46+
from gevent.monkey import get_original as _get_original
47+
else:
4648
def _get_original(mod, name):
47-
return getattr(_original(mod), name)
48-
49-
except ImportError:
50-
try:
51-
from gevent.monkey import get_original as _get_original
52-
except ImportError:
53-
54-
def _get_original(mod, name):
55-
return getattr(__import__(mod), name)
49+
return getattr(__import__(mod), name)
5650

5751

5852
_ORIGINAL_SOCKET = _get_original('socket', 'socket')

0 commit comments

Comments
 (0)