patcher: [py27] recursion error in pytest/python2.7 installing regist…

…er_at_fork #660 getsentry/sentry-python#880 Could not reproduce problem without pytest, so normal production code was probably safe.
eventlet · Oct 21, 2020 · 0a5eee2 · 0a5eee2
1 parent 7b1aa58
commit 0a5eee2
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/eventlet/patcher.py b/eventlet/patcher.py
@@ -1,4 +1,5 @@
 import imp
+import os
 import sys
 
 import eventlet
@@ -298,6 +299,7 @@ def monkey_patch(**on):
             # tell us whether or not we succeeded
             pass
 
+    _threading = original('threading')
     imp.acquire_lock()
     try:
         for name, mod in modules_to_patch:
@@ -313,10 +315,9 @@ def monkey_patch(**on):
                 if hasattr(orig_mod, attr_name):
                     delattr(orig_mod, attr_name)
 
-            _os = original('os')
-            if name == 'threading' and hasattr(_os, 'register_at_fork'):
+            if name == 'threading' and hasattr(os, 'register_at_fork'):
                 def fix_threading_active(
-                    _global_dict=original('threading').current_thread.__globals__,
+                    _global_dict=_threading.current_thread.__globals__,
                     _patched=orig_mod
                 ):
                     _prefork_active = [None]
@@ -328,7 +329,7 @@ def before_fork():
                     def after_fork():
                         _global_dict['_active'] = _prefork_active[0]
 
-                    _os.register_at_fork(
+                    os.register_at_fork(
                         before=before_fork,
                         after_in_parent=after_fork)
                 fix_threading_active()