pydevd-pycharm 242.21829.44__tar.gz → 242.22855.32__tar.gz

{pydevd_pycharm-242.21829.44/pydevd_pycharm.egg-info → pydevd_pycharm-242.22855.32}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pydevd-pycharm
-Version: 242.21829.44
+Version: 242.22855.32
 Summary: PyCharm Debugger (used in PyCharm and PyDev)
 Home-page: https://github.com/JetBrains/intellij-community
 Author: JetBrains, Fabio Zadrozny and others

pydevd_pycharm-242.22855.32/VERSION

@@ -0,0 +1 @@
+242.22855.32

{pydevd_pycharm-242.21829.44 → pydevd_pycharm-242.22855.32}/_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-242.21829.44 → pydevd_pycharm-242.22855.32}/_pydevd_bundle/pydevd_comm.py

@@ -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.21829.44"
+VERSION_STRING = "242.22855.32"
 
 from _pydev_bundle._pydev_filesystem_encoding import getfilesystemencoding
 file_system_encoding = getfilesystemencoding()
@@ -1376,7 +1376,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
@@ -1384,6 +1384,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:
@@ -1401,7 +1402,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.21829.44 → pydevd_pycharm-242.22855.32}/_pydevd_bundle/pydevd_pep_669_tracing_wrapper.py

@@ -16,3 +16,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
+
+try:
+    restart_events = sys.monitoring.restart_events
+except AttributeError:
+    def _dummy_restart_events():
+        pass
+
+    restart_events = _dummy_restart_events

{pydevd_pycharm-242.21829.44 → pydevd_pycharm-242.22855.32}/_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.21829.44 → pydevd_pycharm-242.22855.32}/_pydevd_bundle/pydevd_repr_utils.py

@@ -86,6 +86,9 @@ def _get_external_collection_repr(collection, raise_exception=False):
     return None
 
 
+pydevd_repr_function_python2 = None
+
+
 if IS_PY3K:
     from reprlib import Repr
     from itertools import islice
@@ -102,7 +105,7 @@ if IS_PY3K:
 
 
     class PydevdRepr(Repr):
-        def __init__(self):
+        def __init__(self, do_trim):
             super(PydevdRepr, self).__init__()
             self.fillvalue = '...'
             self.maxdict = \
@@ -115,6 +118,7 @@ if IS_PY3K:
             self.maxlong = \
             self.maxstring = \
             self.maxother = MAX_REPR_ITEM_SIZE
+            self.do_trim = do_trim
 
         def _repr_iterable(self, x, level, left, right, maxiter, trail=''):
             n = len(x)
@@ -125,14 +129,15 @@ if IS_PY3K:
                 repr1 = self.repr1
                 pieces = []
                 curr_length = 0
-                for elem in islice(x, maxiter):
+                max_elements = maxiter if self.do_trim else n
+                for elem in islice(x, max_elements):
                     elem_repr = repr1(elem, newlevel)
                     curr_length += len(elem_repr)
                     pieces.append(elem_repr)
-                    if curr_length >= MAX_REPR_LENGTH:
+                    if curr_length >= MAX_REPR_LENGTH and self.do_trim:
                         break
 
-                if n > maxiter or curr_length >= MAX_REPR_LENGTH:
+                if (n > maxiter or curr_length >= MAX_REPR_LENGTH) and self.do_trim:
                     pieces.append(self.fillvalue)
                 s = ', '.join(pieces)
                 if n == 1 and trail:
@@ -141,7 +146,10 @@ if IS_PY3K:
 
         def repr_str(self, x, level):
             if level == self.maxlevel:
-                return x[:self.maxstring]
+                if self.do_trim:
+                    return x[:self.maxstring]
+                else:
+                    return x
             return super().repr_str(x, level)
 
         def repr_dict(self, x, level):
@@ -152,17 +160,18 @@ if IS_PY3K:
             repr1 = self.repr1
             pieces = []
             curr_length = 0
-            for key in islice(_possibly_sorted(x), self.maxdict):
+            max_elements = self.maxdict if self.do_trim else n
+            for key in islice(_possibly_sorted(x), max_elements):
                 keyrepr = repr1(key, newlevel)
                 valrepr = repr1(x[key], newlevel)
                 elem_repr = '%s: %s' % (keyrepr, valrepr)
                 pieces.append(elem_repr)
                 curr_length += len(elem_repr)
-                if curr_length >= MAX_REPR_LENGTH:
+                if curr_length >= MAX_REPR_LENGTH and self.do_trim:
                     break
 
-            if n > self.maxdict or curr_length >= MAX_REPR_LENGTH:
-                pieces.append('...')
+            if (n > self.maxdict or curr_length >= MAX_REPR_LENGTH) and self.do_trim:
+                pieces.append(self.fillvalue)
             s = ', '.join(pieces)
             return '{%s}' % (s,)
 
@@ -183,10 +192,8 @@ if IS_PY3K:
             # else use `reprlib`
             return super().repr_instance(x, level)
 
-
-    pydevd_repr_function = PydevdRepr().repr
 else:
-    def pydevd_repr_function(value):
+    def pydevd_repr_function(value, do_trim=True):
         # pandas series, ds | ndarray
         result = _get_external_collection_repr(value, True)
         if result is not None:
@@ -203,16 +210,24 @@ else:
 
         if hasattr(value, '__class__'):
             if value.__class__ in limited_size_collection_classes:
-                if len(value) > MAX_REPR_ITEM_SIZE:
+                if len(value) > MAX_REPR_ITEM_SIZE and do_trim:
                     return ('%s' % take_first_n_coll_elements(value, MAX_REPR_ITEM_SIZE)).rstrip(')]}') + '...'
                 return None
 
         # if `__repr__` is overridden, then return repr(value)
         if hasattr(value.__class__, "__repr__"):
-            return repr(value)
+            if do_trim:
+                return repr(value)[:MAX_REPR_LENGTH]
+            else:
+                return repr(value)
 
         # else
-        return str(value)
+        if do_trim:
+            return str(value)[:MAX_REPR_LENGTH]
+        else:
+            return str(value)
+
+    pydevd_repr_function_python2 = pydevd_repr_function
 
 
 def get_value_repr(value, do_trim=True, format=DEFAULT_FORMAT):
@@ -231,9 +246,14 @@ def get_value_repr(value, do_trim=True, format=DEFAULT_FORMAT):
             if format != DEFAULT_FORMAT:
                 value_representation = format % value
             else:
-                value_representation = pydevd_repr_function(value)
-        except:
-            pass
+                if IS_PY3K:
+                    pydevd_repr_fun = PydevdRepr(do_trim).repr
+                    value_representation = pydevd_repr_fun(value)
+                else:
+                    value_representation = pydevd_repr_function_python2(value, do_trim)
+
+        except Exception as e:
+            pydev_log.warn("Failed to get repr for a value: " + str(e))
 
         if value_representation is None:
             value_representation = format % value

{pydevd_pycharm-242.21829.44 → pydevd_pycharm-242.22855.32}/_pydevd_bundle/pydevd_tables.py

@@ -23,9 +23,9 @@ def is_error_on_eval(val):
     return is_exception_on_eval
 
 
-def exec_table_command(init_command, command_type, start_index, end_index, f_globals,
+def exec_table_command(init_command, command_type, start_index, end_index, format, f_globals,
                        f_locals):
-    # type: (str, str, [int, None], [int, None], dict, dict) -> (bool, str)
+    # type: (str, str, [int, None], [int, None], [str, None], dict, dict) -> (bool, str)
     table = pydevd_vars.eval_in_context(init_command, f_globals, f_locals)
     is_exception_on_eval = is_error_on_eval(table)
     if is_exception_on_eval:
@@ -53,7 +53,7 @@ def exec_table_command(init_command, command_type, start_index, end_index, f_glo
         res.append(NEXT_VALUE_SEPARATOR)
 
     elif command_type == TableCommandType.SLICE:
-        res.append(table_provider.get_data(table, start_index, end_index))
+        res.append(table_provider.get_data(table, start_index, end_index, format))
 
     return True, ''.join(res)
 

{pydevd_pycharm-242.21829.44 → pydevd_pycharm-242.22855.32}/_pydevd_bundle/pydevd_utils.py

@@ -564,7 +564,7 @@ def dump_threads(stream=None):
 
 
 def take_first_n_coll_elements(coll, n):
-    if coll.__class__ in (list, tuple, array):
+    if coll.__class__ in (list, tuple, array, str):
         return coll[:n]
     elif coll.__class__ in (set, frozenset, deque):
         buf = []

{pydevd_pycharm-242.21829.44 → pydevd_pycharm-242.22855.32}/_pydevd_bundle/pydevd_xml.py

@@ -21,7 +21,7 @@ from _pydevd_bundle.pydevd_repr_utils import get_value_repr
 from _pydevd_bundle.pydevd_user_type_renderers_utils import \
     try_get_type_renderer_for_var
 from _pydevd_bundle.pydevd_utils import is_string, should_evaluate_full_value, \
-    should_evaluate_shape, is_safe_to_access
+    should_evaluate_shape
 
 try:
     import types
@@ -344,7 +344,8 @@ def var_to_xml(val, name, do_trim=True, additional_in_xml='', evaluate_full_valu
     # shape to xml
     xml_shape = ''
     try:
-        if should_evaluate_shape() and is_safe_to_access(v, 'shape'):
+        # if should_evaluate_shape() and is_safe_to_access(v, 'shape'):
+        if should_evaluate_shape():
             if hasattr(v, 'shape') and not callable(v.shape):
                 xml_shape = ' shape="%s"' % make_valid_xml_value(str(tuple(v.shape)))
             elif hasattr(v, '__len__') and not is_string(v):

{pydevd_pycharm-242.21829.44 → pydevd_pycharm-242.22855.32}/pydevd.py

@@ -57,11 +57,12 @@ from _pydevd_bundle.pydevd_custom_frames import CustomFramesContainer, custom_fr
 from _pydevd_bundle.pydevd_frame_utils import add_exception_to_frame, remove_exception_from_frame
 from _pydevd_bundle.pydevd_kill_all_pydevd_threads import kill_all_pydev_threads
 from _pydevd_bundle.pydevd_trace_dispatch import (
-    trace_dispatch as _trace_dispatch, global_cache_skips, global_cache_frame_skips, show_tracing_warning)
+    trace_dispatch as _trace_dispatch, show_tracing_warning)
 from _pydevd_frame_eval.pydevd_frame_eval_main import (
     frame_eval_func, clear_thread_local_info, dummy_trace_dispatch,
     show_frame_eval_warning)
-from _pydevd_bundle.pydevd_pep_669_tracing_wrapper import enable_pep669_monitoring
+from _pydevd_bundle.pydevd_pep_669_tracing_wrapper import (
+    enable_pep669_monitoring, restart_events)
 from _pydevd_bundle.pydevd_additional_thread_info import set_additional_thread_info
 from _pydevd_bundle.pydevd_utils import save_main_module, is_current_thread_main_thread, \
     kill_thread
@@ -520,6 +521,16 @@ class PyDB(object):
 
         self.is_pep669_monitoring_enabled = False
 
+        if USE_LOW_IMPACT_MONITORING:
+            from _pydevd_bundle.pydevd_pep_669_tracing_wrapper import (
+                global_cache_skips, global_cache_frame_skips)
+        else:
+            from _pydevd_bundle.pydevd_trace_dispatch import (
+                global_cache_skips, global_cache_frame_skips)
+
+        self._global_cache_skips = global_cache_skips
+        self._global_cache_frame_skips = global_cache_frame_skips
+
         self.value_resolve_thread_list = []
 
         if set_as_global:
@@ -922,8 +933,10 @@ class PyDB(object):
         self.clear_skip_caches()
 
     def clear_skip_caches(self):
-        global_cache_skips.clear()
-        global_cache_frame_skips.clear()
+        self._global_cache_skips.clear()
+        self._global_cache_frame_skips.clear()
+        if USE_LOW_IMPACT_MONITORING:
+            restart_events()
 
     def add_break_on_exception(
         self,

{pydevd_pycharm-242.21829.44 → pydevd_pycharm-242.22855.32/pydevd_pycharm.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pydevd-pycharm
-Version: 242.21829.44
+Version: 242.22855.32
 Summary: PyCharm Debugger (used in PyCharm and PyDev)
 Home-page: https://github.com/JetBrains/intellij-community
 Author: JetBrains, Fabio Zadrozny and others

pydevd_pycharm-242.21829.44/VERSION

@@ -1 +0,0 @@
-242.21829.44