If gevent tries to disable the tracing prevent it. Fixes microsoft#1126

fabioz · Nov 18, 2022 · 7a4f5de · 7a4f5de
1 parent 5b27a35
commit 7a4f5de
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/src/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_gevent_integration.py b/src/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_gevent_integration.py
@@ -76,7 +76,7 @@ def enable_gevent_integration():
 
             if not hasattr(greenlet, 'settrace'):
                 # In older versions it was optional.
-                # We still try to use if available though (because without it
+                # We still try to use if available though.
                 pydev_log.debug('greenlet.settrace not available. GEVENT_SHOW_PAUSED_GREENLETS will have no effect.')
                 return
         try:

diff --git a/src/debugpy/_vendored/pydevd/pydevd_tracing.py b/src/debugpy/_vendored/pydevd/pydevd_tracing.py
@@ -48,12 +48,16 @@ def _internal_set_trace(tracing_func):
     if TracingFunctionHolder._warn:
         frame = get_frame()
         if frame is not None and frame.f_back is not None:
-            filename = frame.f_back.f_code.co_filename.lower()
-            if not filename.endswith(
+            filename = os.path.splitext(frame.f_back.f_code.co_filename.lower())[0]
+            if filename.endswith('threadpool') and 'gevent' in filename:
+                if tracing_func is None:
+                    pydev_log.debug('Disabled internal sys.settrace from gevent threadpool.')
+                    return
+
+            elif not filename.endswith(
                     (
-                        'threading.py',
-                        'pydevd_tracing.py',
-                        'threadpool.py',  # This is from gevent.
+                        'threading',
+                        'pydevd_tracing',
                     )
                 ):