From 2bd30aba7cf17b3e56d2ab530113ca2a62cb945a Mon Sep 17 00:00:00 2001 From: Fabio Zadrozny Date: Thu, 7 Oct 2021 10:38:23 -0300 Subject: [PATCH] Sync pydevd --- cgmanifest.json | 2 +- .../_vendored/pydevd/_pydevd_bundle/pydevd_constants.py | 2 +- .../pydevd/_pydevd_frame_eval/pydevd_frame_eval_main.py | 4 ++-- src/debugpy/_vendored/pydevd/pydevd.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cgmanifest.json b/cgmanifest.json index e3cca295..283b7cde 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -24,7 +24,7 @@ { "Component": { "Type": "pip", - "pip": { "Name": "pydevd", "Version": "2.4.1" } + "pip": { "Name": "pydevd", "Version": "2.6.0" } }, "DevelopmentDependency": false }, diff --git a/src/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_constants.py b/src/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_constants.py index 85ea223c..c9a32c5b 100644 --- a/src/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_constants.py +++ b/src/debugpy/_vendored/pydevd/_pydevd_bundle/pydevd_constants.py @@ -164,7 +164,7 @@ IS_PYTHON_STACKLESS = "stackless" in sys.version.lower() CYTHON_SUPPORTED = False python_implementation = platform.python_implementation() -if python_implementation == 'CPython' and not IS_PYTHON_STACKLESS: +if python_implementation == 'CPython': # Only available for CPython! if ( (sys.version_info[0] == 2 and sys.version_info[1] >= 6) diff --git a/src/debugpy/_vendored/pydevd/_pydevd_frame_eval/pydevd_frame_eval_main.py b/src/debugpy/_vendored/pydevd/_pydevd_frame_eval/pydevd_frame_eval_main.py index bf8c2086..b9934e88 100644 --- a/src/debugpy/_vendored/pydevd/_pydevd_frame_eval/pydevd_frame_eval_main.py +++ b/src/debugpy/_vendored/pydevd/_pydevd_frame_eval/pydevd_frame_eval_main.py @@ -3,7 +3,7 @@ import os from _pydev_bundle import pydev_log from _pydevd_bundle.pydevd_trace_dispatch import USING_CYTHON from _pydevd_bundle.pydevd_constants import USE_CYTHON_FLAG, ENV_FALSE_LOWER_VALUES, \ - ENV_TRUE_LOWER_VALUES, IS_PY36_OR_GREATER, SUPPORT_GEVENT, IS_PYTHON_STACKLESS + ENV_TRUE_LOWER_VALUES, IS_PY36_OR_GREATER, IS_PY38_OR_GREATER, SUPPORT_GEVENT, IS_PYTHON_STACKLESS frame_eval_func = None stop_frame_eval = None @@ -18,7 +18,7 @@ use_frame_eval = os.environ.get('PYDEVD_USE_FRAME_EVAL', '').lower() if use_frame_eval in ENV_FALSE_LOWER_VALUES or USE_CYTHON_FLAG in ENV_FALSE_LOWER_VALUES or not USING_CYTHON: pass -elif SUPPORT_GEVENT or IS_PYTHON_STACKLESS: +elif SUPPORT_GEVENT or (IS_PYTHON_STACKLESS and not IS_PY38_OR_GREATER): pass # i.e gevent and frame eval mode don't get along very well. # https://github.com/microsoft/debugpy/issues/189 diff --git a/src/debugpy/_vendored/pydevd/pydevd.py b/src/debugpy/_vendored/pydevd/pydevd.py index 0a2d3a72..a4f110fb 100644 --- a/src/debugpy/_vendored/pydevd/pydevd.py +++ b/src/debugpy/_vendored/pydevd/pydevd.py @@ -98,7 +98,7 @@ from _pydevd_bundle.pydevd_thread_lifecycle import suspend_all_threads, mark_thr if USE_CUSTOM_SYS_CURRENT_FRAMES_MAP: from _pydevd_bundle.pydevd_constants import constructed_tid_to_last_frame -__version_info__ = (2, 4, 1) +__version_info__ = (2, 6, 0) __version_info_str__ = [] for v in __version_info__: __version_info_str__.append(str(v))