pydevd-pycharm 242.18071.12__tar.gz → 243.22562.23__tar.gz

pydevd_pycharm-243.22562.23/PKG-INFO

@@ -0,0 +1,74 @@
+Metadata-Version: 2.1
+Name: pydevd-pycharm
+Version: 243.22562.23
+Summary: PyCharm Debugger (used in PyCharm and PyDev)
+Home-page: https://github.com/JetBrains/intellij-community
+Author: JetBrains, Fabio Zadrozny and others
+License: Apache 2.0
+Keywords: pydev,pydevd,pydev.debugger,pycharm
+Classifier: Development Status :: 6 - Mature
+Classifier: Environment :: Console
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: Apache Software License
+Classifier: Operating System :: MacOS :: MacOS X
+Classifier: Operating System :: Microsoft :: Windows
+Classifier: Operating System :: POSIX
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2
+Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.4
+Classifier: Programming Language :: Python :: 3.5
+Classifier: Programming Language :: Python :: 3.6
+Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Topic :: Software Development :: Debuggers
+License-File: LICENSE
+
+PyDev.Debugger
+==============
+
+The sources for the PyDev.Debugger (used in PyDev & PyCharm) may be seen at:
+
+https://github.com/fabioz/PyDev.Debugger
+
+In general, the debugger backend should **NOT** be installed separately if you're using an IDE which already
+bundles it (such as PyDev or PyCharm).
+
+It is however available in PyPi so that it can be installed for doing remote debugging with `pip` -- so, when
+debugging a process which runs in another machine, it's possible to `pip install pydevd-pycharm` and in the code use
+`pydevd_pycharm.settrace(host='10.1.1.1')` to connect the debugger backend to the debugger UI running in the IDE
+(whereas previously the sources had to be manually copied from the IDE installation).
+
+It should be compatible with Python 2.6 onwards (as well as Jython 2.7, IronPython and PyPy -- and
+any other variant which properly supports the Python structure for debuggers -- i.e.: sys.settrace/threading.settrace).
+
+Recent versions contain speedup modules using Cython, which are generated with a few changes in the regular files
+to `cythonize` the files. To update and compile the cython sources (and generate some other auto-generated files),
+`build_tools/build.py` should be run -- note that the resulting .pyx and .c files should be commited.
+
+To generate a distribution with the precompiled binaries for the IDE, `build_binaries_windows.py` should be run (
+note that the environments must be pre-created as specified in that file).
+
+To generate a distribution to upload to PyPi, `python setup.py sdist bdist_wheel` should be run for each python version
+which should have a wheel and afterwards `twine upload -s dist/pydevd-*` should be run to actually upload the contents
+to PyPi.
+
+Travis (Linux CI):
+
+.. |travis| image:: https://travis-ci.org/fabioz/PyDev.Debugger.png
+  :target: https://travis-ci.org/fabioz/PyDev.Debugger
+
+|travis|
+
+Appveyor (Windows CI):
+
+.. |appveyor| image:: https://ci.appveyor.com/api/projects/status/j6vjq687brbk20ux?svg=true
+  :target: https://ci.appveyor.com/project/fabioz/pydev-debugger
+
+|appveyor|
+

pydevd_pycharm-243.22562.23/VERSION

@@ -0,0 +1 @@
+243.22562.23

{pydevd-pycharm-242.18071.12 → pydevd_pycharm-243.22562.23}/_pydev_bundle/pydev_console_utils.py

@@ -1,5 +1,4 @@
 import os
-import signal
 import sys
 import traceback
 
@@ -8,7 +7,6 @@ from _pydev_bundle.pydev_code_executor import BaseCodeExecutor
 from _pydev_bundle.pydev_console_types import CodeFragment
 from _pydev_bundle.pydev_imports import Exec
 from _pydev_bundle.pydev_stdin import StdIn, DebugConsoleStdIn
-from _pydev_imps._pydev_saved_modules import thread
 from _pydevd_bundle import pydevd_thrift
 from _pydevd_bundle import pydevd_vars
 from _pydevd_bundle.pydevd_comm import InternalDataViewerAction
@@ -413,7 +411,7 @@ class BaseInterpreterInterface(BaseCodeExecutor):
             raise PythonUnhandledException(traceback.format_exc())
 
     #
-    def execTableCommand(self, command, command_type, start_index, end_index):
+    def execTableCommand(self, command, command_type, start_index, end_index, format):
         try:
             try:
                 start_index = int(start_index)
@@ -422,7 +420,7 @@ class BaseInterpreterInterface(BaseCodeExecutor):
                 start_index = None
                 end_index = None
             success, res = exec_table_command(command, command_type,
-                                              start_index, end_index,
+                                              start_index, end_index, format,
                                               self.get_namespace(),
                                               self.get_namespace())
             if success:

pydevd_pycharm-243.22562.23/_pydev_bundle/pydev_is_thread_alive.py

@@ -0,0 +1,32 @@
+from _pydev_imps._pydev_saved_modules import threading
+
+# Hack for https://www.brainwy.com/tracker/PyDev/363
+# I.e.: calling isAlive() can throw AssertionError under some circumstances
+# It is required to debug threads started by start_new_thread in Python 3.4
+_temp = threading.Thread()
+
+# Python <=3.12
+if hasattr(_temp, '_is_stopped'):
+    def is_thread_alive(t):
+        return not t._is_stopped
+
+# Python 2.x
+elif hasattr(_temp, '_Thread__stopped'):
+    def is_thread_alive(t):
+        return not t._Thread__stopped
+
+# Jython wraps a native java thread and thus only obeys the public API
+elif hasattr(_temp, 'isAlive'):
+    def is_thread_alive(t):
+        return t.isAlive()
+
+# Python >=3.13
+elif hasattr(_temp, 'is_alive'):
+    def is_thread_alive(t):
+        return t.is_alive()
+
+else:
+    def is_thread_alive(t):
+        raise RuntimeError('Cannot determine how to check if thread is alive')
+
+del _temp

{pydevd-pycharm-242.18071.12 → pydevd_pycharm-243.22562.23}/_pydevd_bundle/pydevd_comm.py

@@ -71,8 +71,10 @@ from _pydev_imps._pydev_saved_modules import threading
 from _pydev_imps._pydev_saved_modules import time
 from _pydev_imps._pydev_saved_modules import socket
 from socket import socket, AF_INET, SOCK_STREAM, SHUT_RD, SHUT_WR, SOL_SOCKET, SO_REUSEADDR, SHUT_RDWR, timeout
-from _pydevd_bundle.pydevd_constants import DebugInfoHolder, get_thread_id, IS_JYTHON, IS_PY2, IS_PY3K, \
-    IS_PY36_OR_GREATER, STATE_RUN, dict_keys, ASYNC_EVAL_TIMEOUT_SEC, IS_IRONPYTHON, GlobalDebuggerHolder, \
+from _pydevd_bundle.pydevd_constants import DebugInfoHolder, get_thread_id, IS_JYTHON, \
+    IS_PY2, IS_PY3K, \
+    IS_PY36_OR_GREATER, STATE_RUN, dict_keys, ASYNC_EVAL_TIMEOUT_SEC, IS_IRONPYTHON, \
+    GlobalDebuggerHolder, \
     get_global_debugger, GetGlobalDebugger, set_global_debugger, NEXT_VALUE_SEPARATOR
 from _pydev_bundle.pydev_override import overrides
 import json
@@ -96,9 +98,7 @@ from _pydevd_bundle import pydevd_vm_type
 from _pydevd_bundle.smart_step_into import find_stepping_variants
 from pydevd_file_utils import get_abs_path_real_path_and_base_from_frame, norm_file_to_client, is_real_file
 import pydevd_file_utils
-import os
 import sys
-import inspect
 import traceback
 from _pydevd_bundle.pydevd_utils import quote_smart as quote, compare_object_attrs_key, to_string, \
     get_non_pydevd_threads, is_pandas_container, is_numpy_container
@@ -148,7 +148,7 @@ from _pydevd_bundle.pydevd_comm_constants import (
 MAX_IO_MSG_SIZE = 1000  #if the io is too big, we'll not send all (could make the debugger too non-responsive)
 #this number can be changed if there's need to do so
 
-VERSION_STRING = "242.18071.12"
+VERSION_STRING = "243.22562.23"
 
 from _pydev_bundle._pydev_filesystem_encoding import getfilesystemencoding
 file_system_encoding = getfilesystemencoding()
@@ -270,9 +270,7 @@ class ReaderThread(PyDBDaemonThread):
         self.name = "pydevd.Reader"
         from _pydevd_bundle.pydevd_process_net_command import process_net_command
         self.process_net_command = process_net_command
-        self.global_debugger_holder = GlobalDebuggerHolder
-
-
+        self.debugger = GlobalDebuggerHolder.global_dbg
 
     def do_kill_pydev_thread(self):
         #We must close the socket so that it doesn't stay halted there.
@@ -330,12 +328,11 @@ class ReaderThread(PyDBDaemonThread):
             traceback.print_exc()
             self.handle_except()
 
-
     def handle_except(self):
-        self.global_debugger_holder.global_dbg.finish_debugging_session()
+        self.debugger.finish_debugging_session()
 
     def process_command(self, cmd_id, seq, text):
-        self.process_net_command(self.global_debugger_holder.global_dbg, cmd_id, seq, text)
+        self.process_net_command(self.debugger, cmd_id, seq, text)
 
 
 #----------------------------------------------------------------------------------- SOCKET UTILITIES - WRITER
@@ -425,14 +422,19 @@ def start_server(port):
         newSock, _addr = s.accept()
         pydevd_log(1, "Connection accepted")
         # closing server socket is not necessary but we don't need it
-        s.shutdown(SHUT_RDWR)
-        s.close()
+        try:
+            s.shutdown(SHUT_RDWR)
+        except:
+            pass
+        finally:
+            s.close()
         return newSock
 
     except:
         sys.stderr.write("Could not bind to port: %s\n" % (port,))
         sys.stderr.flush()
         traceback.print_exc()
+        raise
 
 #=======================================================================================================================
 # start_client
@@ -1379,7 +1381,7 @@ class InternalDataViewerAction(InternalThreadCommand):
 #=======================================================================================================================
 class InternalTableCommand(InternalThreadCommand):
     def __init__(self, sequence, thread_id, frame_id, init_command, command_type,
-                 start_index, end_index):
+                 start_index, end_index, format):
         super().__init__(thread_id)
         self.sequence = sequence
         self.frame_id = frame_id
@@ -1387,6 +1389,7 @@ class InternalTableCommand(InternalThreadCommand):
         self.command_type = command_type
         self.start_index = start_index
         self.end_index = end_index
+        self.format = format
 
     def do_it(self, dbg):
         try:
@@ -1404,7 +1407,8 @@ class InternalTableCommand(InternalThreadCommand):
             dbg.writer.add_command(cmd)
 
     def exec_command(self, frame):
-        return exec_table_command(self.init_command, self.command_type, self.start_index, self.end_index,
+        return exec_table_command(self.init_command, self.command_type,
+                                  self.start_index, self.end_index, self.format,
                                   frame.f_globals, frame.f_locals)
 
 

{pydevd-pycharm-242.18071.12 → pydevd_pycharm-243.22562.23}/_pydevd_bundle/pydevd_frame_type_handler.py

@@ -1,4 +1,6 @@
 #  Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+import threading
+
 from _pydevd_bundle.pydevd_constants import RETURN_VALUES_DICT, dict_iter_items, \
     GET_FRAME_NORMAL_GROUP, GET_FRAME_SPECIAL_GROUP
 
@@ -172,19 +174,36 @@ THRIFT_COMMUNICATION_VARS_HANDLER = 1
 
 
 class VarsHandlerContainer:
-    _instance_xml_handler = None
-    _instance_thrift_handler = None
+    instance_xml_handler = None
+    instance_thrift_handler = None
+
+
+_vars_handler_initialization_lock = threading.RLock()
+
+
+def _init_xml_communication_vars_handler(func, handler_type):
+    with _vars_handler_initialization_lock:
+        if VarsHandlerContainer.instance_xml_handler is None:
+            VarsHandlerContainer.instance_xml_handler = \
+                VarsHandler(func, handler_type)
+
+
+def _init_thrift_communication_var_handler(func, handler_type):
+    with _vars_handler_initialization_lock:
+        if VarsHandlerContainer.instance_thrift_handler is None:
+            VarsHandlerContainer.instance_thrift_handler = \
+                VarsHandler(func, handler_type)
 
 
 def get_vars_handler(func, handler_type, group_type):
     if handler_type == XML_COMMUNICATION_VARS_HANDLER:
-        if VarsHandlerContainer._instance_xml_handler is None:
-            VarsHandlerContainer._instance_xml_handler = VarsHandler(func, handler_type)
-        return VarsHandlerContainer._instance_xml_handler.get_instance(group_type)
+        if VarsHandlerContainer.instance_xml_handler is None:
+            _init_xml_communication_vars_handler(func, handler_type)
+        return VarsHandlerContainer.instance_xml_handler.get_instance(group_type)
     elif handler_type == THRIFT_COMMUNICATION_VARS_HANDLER:
-        if VarsHandlerContainer._instance_thrift_handler is None:
-            VarsHandlerContainer._instance_thrift_handler = VarsHandler(func, handler_type)
-        return VarsHandlerContainer._instance_thrift_handler.get_instance(group_type)
+        if VarsHandlerContainer.instance_thrift_handler is None:
+            _init_thrift_communication_var_handler(func, handler_type)
+        return VarsHandlerContainer.instance_thrift_handler.get_instance(group_type)
 
 
 class VarsHandler:
@@ -194,23 +213,26 @@ class VarsHandler:
         self._instance_special = None
         self._instance_return = None
         self.handler_type = handler_type
+        self._lock = threading.RLock()
 
     def get_instance(self, group_type):
-        if group_type == GET_FRAME_NORMAL_GROUP:
-            if self._instance_normal is None:
-                self._init_normal()
-            instance = self._instance_normal
-        elif group_type == GET_FRAME_SPECIAL_GROUP:
-            if self._instance_special is None:
-                self._init_special()
-            instance = self._instance_special
-        else:
-            if self._instance_return is None:
-                self._init_return()
-            instance = self._instance_return
+        with self._lock:
+            if group_type == GET_FRAME_NORMAL_GROUP:
+                if self._instance_normal is None:
+                    self._init_normal()
+                instance = self._instance_normal
+            elif group_type == GET_FRAME_SPECIAL_GROUP:
+                if self._instance_special is None:
+                    self._init_special()
+                instance = self._instance_special
+            else:
+                if self._instance_return is None:
+                    self._init_return()
+                instance = self._instance_return
+
+            instance.update_handlers()
 
-        instance.update_handlers()
-        return instance
+            return instance
 
     def _init_normal(self):
         self._instance_normal = DummyVarHandler(

{pydevd-pycharm-242.18071.12 → pydevd_pycharm-243.22562.23}/_pydevd_bundle/pydevd_pep_669_tracing_wrapper.py

@@ -1,11 +1,13 @@
 import os
 import sys
 
+from _pydevd_bundle.pydevd_constants import IS_PY312_OR_GREATER
+
 use_cython = os.getenv('PYDEVD_USE_CYTHON', None)
 
 if use_cython == 'NO':
     from _pydevd_bundle import pydevd_pep_669_tracing as mod
-elif use_cython == 'YES':
+elif use_cython == 'YES' and IS_PY312_OR_GREATER:
     from _pydevd_bundle import pydevd_pep_669_tracing_cython as mod
 else:
     try:
@@ -16,3 +18,13 @@ else:
 sys.modules['_pydevd_bundle.pydevd_pep_669_tracing'] = mod
 
 enable_pep669_monitoring = mod.enable_pep669_monitoring
+global_cache_skips = mod.global_cache_skips
+global_cache_frame_skips = mod.global_cache_frame_skips
+
+def _dummy_restart_events():
+    pass
+
+try:
+    restart_events = sys.monitoring.restart_events
+except AttributeError:
+    restart_events = _dummy_restart_events

{pydevd-pycharm-242.18071.12 → pydevd_pycharm-243.22562.23}/_pydevd_bundle/pydevd_process_net_command.py

@@ -1,36 +1,73 @@
+import json
 import os
 import sys
 import traceback
 
+import pydevd_file_utils
+import pydevd_tracing
 from _pydev_bundle import pydev_log
+from _pydev_imps._pydev_saved_modules import threading
 from _pydevd_bundle import pydevd_traceproperty, pydevd_dont_trace, pydevd_utils
-import pydevd_tracing
-import pydevd_file_utils
+from _pydevd_bundle.pydevd_additional_thread_info import set_additional_thread_info
 from _pydevd_bundle.pydevd_breakpoints import LineBreakpoint, get_exception_class
-from _pydevd_bundle.pydevd_comm import (CMD_RUN, CMD_VERSION, CMD_LIST_THREADS, CMD_THREAD_KILL,
-    CMD_THREAD_SUSPEND, pydevd_find_thread_by_id, CMD_THREAD_RUN, InternalRunThread, CMD_STEP_INTO, CMD_STEP_OVER,
-    CMD_STEP_RETURN, CMD_STEP_INTO_MY_CODE, InternalStepThread, CMD_RUN_TO_LINE, CMD_SET_NEXT_STATEMENT,
-    CMD_SMART_STEP_INTO, InternalSetNextStatementThread, CMD_RELOAD_CODE, ReloadCodeCommand, CMD_CHANGE_VARIABLE,
-    InternalChangeVariable, CMD_GET_VARIABLE, InternalGetVariable, CMD_GET_ARRAY, InternalGetArray, CMD_GET_COMPLETIONS,
-    InternalGetCompletions, CMD_GET_FRAME, InternalGetFrame, CMD_SET_BREAK, file_system_encoding, CMD_REMOVE_BREAK,
-    CMD_EVALUATE_EXPRESSION, CMD_EXEC_EXPRESSION, InternalEvaluateExpression, CMD_CONSOLE_EXEC, InternalConsoleExec,
-    CMD_SET_PY_EXCEPTION, CMD_GET_FILE_CONTENTS, CMD_SET_PROPERTY_TRACE, CMD_ADD_EXCEPTION_BREAK,
-    CMD_REMOVE_EXCEPTION_BREAK, CMD_LOAD_SOURCE, CMD_ADD_DJANGO_EXCEPTION_BREAK, CMD_REMOVE_DJANGO_EXCEPTION_BREAK,
-    CMD_EVALUATE_CONSOLE_EXPRESSION, InternalEvaluateConsoleExpression, InternalConsoleGetCompletions,
-    CMD_RUN_CUSTOM_OPERATION, InternalRunCustomOperation, CMD_IGNORE_THROWN_EXCEPTION_AT, CMD_ENABLE_DONT_TRACE,
-    CMD_SHOW_RETURN_VALUES, CMD_SET_UNIT_TEST_DEBUGGING_MODE, ID_TO_MEANING, CMD_GET_DESCRIPTION, InternalGetDescription,
-    InternalLoadFullValue, CMD_LOAD_FULL_VALUE, CMD_PROCESS_CREATED_MSG_RECEIVED, CMD_REDIRECT_OUTPUT, CMD_GET_NEXT_STATEMENT_TARGETS,
-    InternalGetNextStatementTargets, CMD_SET_PROJECT_ROOTS, CMD_GET_SMART_STEP_INTO_VARIANTS,
-    CMD_GET_THREAD_STACK, CMD_THREAD_DUMP_TO_STDERR, CMD_STOP_ON_START, CMD_GET_EXCEPTION_DETAILS, NetCommand,
-    CMD_SET_PROTOCOL, CMD_PYDEVD_JSON_CONFIG, InternalGetThreadStack, InternalSmartStepInto, InternalGetSmartStepIntoVariants,
-    CMD_DATAVIEWER_ACTION, InternalDataViewerAction, CMD_TABLE_EXEC, InternalTableCommand, CMD_INTERRUPT_DEBUG_CONSOLE, CMD_SET_USER_TYPE_RENDERERS)
+from _pydevd_bundle.pydevd_comm import (CMD_RUN, CMD_VERSION, CMD_LIST_THREADS,
+                                        CMD_THREAD_SUSPEND, pydevd_find_thread_by_id,
+                                        CMD_THREAD_RUN, CMD_STEP_INTO, CMD_STEP_OVER,
+                                        CMD_STEP_RETURN, CMD_STEP_INTO_MY_CODE,
+                                        InternalStepThread, CMD_RUN_TO_LINE,
+                                        CMD_SET_NEXT_STATEMENT,
+                                        CMD_SMART_STEP_INTO,
+                                        InternalSetNextStatementThread, CMD_RELOAD_CODE,
+                                        ReloadCodeCommand,
+                                        CMD_CHANGE_VARIABLE,
+                                        InternalChangeVariable, CMD_GET_VARIABLE,
+                                        InternalGetVariable, CMD_GET_ARRAY,
+                                        InternalGetArray,
+                                        CMD_GET_COMPLETIONS,
+                                        InternalGetCompletions, CMD_GET_FRAME,
+                                        InternalGetFrame, CMD_SET_BREAK,
+                                        file_system_encoding,
+                                        CMD_REMOVE_BREAK,
+                                        CMD_EVALUATE_EXPRESSION, CMD_EXEC_EXPRESSION,
+                                        InternalEvaluateExpression, CMD_CONSOLE_EXEC,
+                                        InternalConsoleExec,
+                                        CMD_SET_PY_EXCEPTION, CMD_GET_FILE_CONTENTS,
+                                        CMD_SET_PROPERTY_TRACE, CMD_ADD_EXCEPTION_BREAK,
+                                        CMD_REMOVE_EXCEPTION_BREAK, CMD_LOAD_SOURCE,
+                                        CMD_ADD_DJANGO_EXCEPTION_BREAK,
+                                        CMD_REMOVE_DJANGO_EXCEPTION_BREAK,
+                                        CMD_EVALUATE_CONSOLE_EXPRESSION,
+                                        InternalEvaluateConsoleExpression,
+                                        InternalConsoleGetCompletions,
+                                        CMD_RUN_CUSTOM_OPERATION,
+                                        InternalRunCustomOperation,
+                                        CMD_IGNORE_THROWN_EXCEPTION_AT,
+                                        CMD_ENABLE_DONT_TRACE,
+                                        CMD_SHOW_RETURN_VALUES,
+                                        CMD_SET_UNIT_TEST_DEBUGGING_MODE,
+                                        CMD_GET_DESCRIPTION,
+                                        InternalGetDescription,
+                                        InternalLoadFullValue, CMD_LOAD_FULL_VALUE,
+                                        CMD_PROCESS_CREATED_MSG_RECEIVED,
+                                        CMD_REDIRECT_OUTPUT,
+                                        CMD_GET_NEXT_STATEMENT_TARGETS,
+                                        InternalGetNextStatementTargets,
+                                        CMD_SET_PROJECT_ROOTS,
+                                        CMD_GET_SMART_STEP_INTO_VARIANTS,
+                                        CMD_GET_THREAD_STACK, CMD_THREAD_DUMP_TO_STDERR,
+                                        CMD_STOP_ON_START, CMD_GET_EXCEPTION_DETAILS,
+                                        NetCommand,
+                                        CMD_SET_PROTOCOL, CMD_PYDEVD_JSON_CONFIG,
+                                        InternalGetThreadStack, InternalSmartStepInto,
+                                        InternalGetSmartStepIntoVariants,
+                                        CMD_DATAVIEWER_ACTION, InternalDataViewerAction,
+                                        CMD_TABLE_EXEC, InternalTableCommand,
+                                        CMD_INTERRUPT_DEBUG_CONSOLE,
+                                        CMD_SET_USER_TYPE_RENDERERS)
 from _pydevd_bundle.pydevd_constants import (get_thread_id, IS_PY3K, DebugInfoHolder,
                                              dict_keys, STATE_RUN,
                                              NEXT_VALUE_SEPARATOR, IS_WINDOWS,
                                              get_current_thread_id)
-from _pydevd_bundle.pydevd_additional_thread_info import set_additional_thread_info
-from _pydev_imps._pydev_saved_modules import threading
-import json
 from _pydevd_bundle.pydevd_user_type_renderers import parse_set_type_renderers_message
 
 
@@ -897,13 +934,14 @@ def process_net_command(py_db, cmd_id, seq, text):
                     parameters = text.split('\t')
                     thread_id, frame_id, init_command, command_type = parameters[:4]
 
-                    start_index, end_index = None, None
+                    start_index, end_index, format = None, None, None
 
-                    if len(parameters) >= 6:
+                    if len(parameters) >= 7:
                         start_index = int(parameters[4])
                         end_index = int(parameters[5])
+                        format = parameters[6]
 
-                    int_cmd = InternalTableCommand(seq, thread_id, frame_id, init_command, command_type, start_index, end_index)
+                    int_cmd = InternalTableCommand(seq, thread_id, frame_id, init_command, command_type, start_index, end_index, format)
                     py_db.post_internal_command(int_cmd, thread_id)
                 except:
                     traceback.print_exc()

{pydevd-pycharm-242.18071.12 → pydevd_pycharm-243.22562.23}/_pydevd_bundle/pydevd_reload.py

@@ -98,16 +98,15 @@ target namespace.
 
 """
 
-import importlib.util
-import importlib.machinery
 import os
-from _pydev_bundle.pydev_imports import Exec
-from _pydevd_bundle import pydevd_dont_trace
-from _pydevd_bundle.pydevd_constants import IS_PY38_OR_GREATER
 import sys
 import traceback
 import types
 
+from _pydev_bundle.pydev_imports import Exec
+from _pydevd_bundle import pydevd_dont_trace
+from _pydevd_bundle.pydevd_constants import IS_PY38_OR_GREATER
+
 NO_DEBUG = 0
 LEVEL1 = 1
 LEVEL2 = 2
@@ -195,8 +194,73 @@ def xreload(mod):
 #=======================================================================================================================
 # Reload
 #=======================================================================================================================
-class Reload:
+def get_code3(modname, path):
+    # type: (str, str | None) -> types.CodeType | None
+
+    import importlib.util
+    import importlib.machinery
+
+    # Find the module; may raise ImportError
+    spec = importlib.util.find_spec(modname, path)
+    if spec is None:
+        raise ImportError("No module named '%s' could be found" % modname)
+
+    filename = spec.origin
+    stream = open(filename, 'r') if filename else None
+    _, ext = os.path.splitext(filename)
+    if ext in importlib.machinery.SOURCE_SUFFIXES:
+        kind = importlib.machinery.SOURCE_SUFFIXES
+    elif ext in importlib.machinery.BYTECODE_SUFFIXES:
+        kind = importlib.machinery.BYTECODE_SUFFIXES
+    elif ext in importlib.machinery.EXTENSION_SUFFIXES:
+        kind = importlib.machinery.EXTENSION_SUFFIXES
+    else:
+        kind = 'unknown'
+
+    try:
+        # Is it Python source code or byte code read from a file?
+        if kind not in (importlib.machinery.BYTECODE_SUFFIXES, importlib.machinery.SOURCE_SUFFIXES):
+            return
+        if kind == importlib.machinery.SOURCE_SUFFIXES:
+            source = stream.read()
+            code = compile(source, filename, "exec")
+        else:
+            import marshal
+            code = marshal.load(stream)
+    finally:
+        if stream:
+            stream.close()
+
+    return code
+
+
+def get_code2(modname, path):
+    # type: (str, str | None) -> types.CodeType | None
+
+    import imp
+
+    # Find the module; may raise ImportError
+    (stream, filename, (suffix, mode, kind)) = imp.find_module(modname, path)
+
+    # Turn it into a code object
+    try:
+        # Is it Python source code or byte code read from a file?
+        if kind not in (imp.PY_COMPILED, imp.PY_SOURCE):
+            return
+        if kind == imp.PY_SOURCE:
+            source = stream.read()
+            code = compile(source, filename, "exec")
+        else:
+            import marshal
+            code = marshal.load(stream)
+    finally:
+        if stream:
+            stream.close()
+
+    return code
+
 
+class Reload:
     def __init__(self, mod):
         self.mod = mod
         self.found_change = False
@@ -224,38 +288,17 @@ class Reload:
                 # Search the top-level module path
                 pkg = None
                 path = None  # Make find_module() uses the default search path
-            # Find the module; may raise ImportError
-            spec = importlib.util.find_spec(modname, path)
-            if spec is None:
-                raise ImportError("No module named '%s' could be found" % modname)
-
-            filename = spec.origin
-            stream = open(filename, 'r') if filename else None
-            _, ext = os.path.splitext(filename)
-            if ext in importlib.machinery.SOURCE_SUFFIXES:
-                kind = importlib.machinery.SOURCE_SUFFIXES
-            elif ext in importlib.machinery.BYTECODE_SUFFIXES:
-                kind = importlib.machinery.BYTECODE_SUFFIXES
-            elif ext in importlib.machinery.EXTENSION_SUFFIXES:
-                kind = importlib.machinery.EXTENSION_SUFFIXES
+
+            if sys.version_info < (3,):
+                code = get_code2(modname, path)
             else:
-                kind = 'unknown'
-
-            try:
-                # Is it Python source code or byte code read from a file?
-                if kind not in (importlib.machinery.BYTECODE_SUFFIXES, importlib.machinery.SOURCE_SUFFIXES):
-                    # Fall back to built-in reload()
-                    notify_error('Could not find source to reload (mod: %s)' % (modname,))
-                    return
-                if kind == importlib.machinery.SOURCE_SUFFIXES:
-                    source = stream.read()
-                    code = compile(source, filename, "exec")
-                else:
-                    import marshal
-                    code = marshal.load(stream)
-            finally:
-                if stream:
-                    stream.close()
+                code = get_code3(modname, path)
+
+            if not code:
+                # Fall back to built-in reload()
+                notify_error('Could not find source to reload (mod: %s)' % (modname,))
+                return
+
             # Execute the code.  We copy the module dict to a temporary; then
             # clear the module dict; then execute the new code in the module
             # dict; then swap things back and around.  This trick (due to