pydevd-pycharm 222.2270.35__tar.gz → 241.15989.57__tar.gz

{pydevd-pycharm-222.2270.35/pydevd_pycharm.egg-info → pydevd-pycharm-241.15989.57}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: pydevd-pycharm
-Version: 222.2270.35
+Version: 241.15989.57
 Summary: PyCharm Debugger (used in PyCharm and PyDev)
 Home-page: https://github.com/JetBrains/intellij-community
 Author: JetBrains, Fabio Zadrozny and others
@@ -69,4 +69,7 @@ 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

pydevd-pycharm-241.15989.57/VERSION

@@ -0,0 +1 @@
+241.15989.57

{pydevd-pycharm-222.2270.35 → pydevd-pycharm-241.15989.57}/_pydev_bundle/_pydev_calltip_util.py

@@ -5,7 +5,7 @@ Author: Yuli Fitterman
 # noinspection PyBroadException
 import types
 
-from _pydevd_bundle.pydevd_constants import IS_JYTHON, IS_PY3K
+from _pydevd_bundle.pydevd_constants import IS_JYTHON, IS_PY3K, IS_PY311_OR_GREATER
 
 try:
     import inspect
@@ -101,17 +101,25 @@ def get_description(obj):
     fn_class = None
     if callable(fob):
         try:
-            if IS_PY3K:
-                spec_info = inspect.getfullargspec(fob)
+            if IS_PY311_OR_GREATER:
+                spec_info = inspect.signature(fob)
+                argspec = str(spec_info)
             else:
-                spec_info = inspect.getargspec(fob)
+                if IS_PY3K:
+                    spec_info = inspect.getfullargspec(fob)
+                else:
+                    spec_info = inspect.getargspec(fob)
+                argspec = inspect.formatargspec(*spec_info)
         except TypeError:
             if is_init_func:
                 spec_info = getargspec_py2(obj)
             else:
                 spec_info = getargspec_py2(fob)
+            argspec = inspect.formatargspec(*spec_info)
+        except ValueError:
+            # function/method defined in C for example str.count
+            argspec = None
 
-        argspec = inspect.formatargspec(*spec_info)
         fn_name = getattr(fob, '__name__', None)
         if isinstance(obj, type) or type(obj).__name__ == 'classobj':
             fn_name = "__init__"

{pydevd-pycharm-222.2270.35 → pydevd-pycharm-241.15989.57}/_pydev_bundle/pydev_console_utils.py

@@ -185,10 +185,10 @@ class BaseInterpreterInterface(BaseCodeExecutor):
         else:
             return True
 
-    def getFrame(self):
+    def getFrame(self, group_type):
         try:
             hidden_ns = self.get_ipython_hidden_vars_dict()
-            return pydevd_thrift.frame_vars_to_struct(self.get_namespace(), hidden_ns, self.user_type_renderers)
+            return pydevd_thrift.frame_vars_to_struct(self.get_namespace(), group_type, hidden_ns, self.user_type_renderers)
         except:
             traceback.print_exc()
             raise PythonUnhandledException(traceback.format_exc())
@@ -375,7 +375,7 @@ class BaseInterpreterInterface(BaseCodeExecutor):
 
                 from _pydevd_bundle.pydevd_constants import set_thread_id
                 from _pydev_bundle import pydev_localhost
-                set_thread_id(threading.currentThread(), "console_main")
+                set_thread_id(threading.current_thread(), "console_main")
 
                 self.orig_find_frame = pydevd_vars.find_frame
                 pydevd_vars.find_frame = self._findFrame
@@ -412,9 +412,17 @@ class BaseInterpreterInterface(BaseCodeExecutor):
             traceback.print_exc()
             raise PythonUnhandledException(traceback.format_exc())
 
-    def execTableCommand(self, command, command_type):
+    #
+    def execTableCommand(self, command, command_type, start_index, end_index):
         try:
+            try:
+                start_index = int(start_index)
+                end_index = int(end_index)
+            except ValueError:
+                start_index = None
+                end_index = None
             success, res = exec_table_command(command, command_type,
+                                              start_index, end_index,
                                               self.get_namespace(),
                                               self.get_namespace())
             if success:

pydevd-pycharm-241.15989.57/_pydev_bundle/pydev_ipython_code_executor.py

@@ -0,0 +1,97 @@
+import sys
+import traceback
+
+from _pydev_bundle.pydev_code_executor import BaseCodeExecutor
+from _pydev_bundle.pydev_ipython_console_011 import get_pydev_ipython_frontend, PyDebuggerTerminalInteractiveShell, get_ipython_hidden_vars
+from _pydevd_bundle.pydevd_constants import dict_iter_items
+from IPython.core.interactiveshell import InteractiveShell
+
+
+# Uncomment to force PyDev standard shell.
+# raise ImportError()
+
+# TODO reuse `CodeExecutor` in `InterpreterInterface` in pydev_ipython_console.py
+#=======================================================================================================================
+# IPythonCodeExecutor
+#=======================================================================================================================
+class IPythonCodeExecutor(BaseCodeExecutor):
+    '''
+        The methods in this class should be registered in the xml-rpc server.
+    '''
+
+    def __init__(self, show_banner=True, rpc_client=None):
+        super(IPythonCodeExecutor, self).__init__()
+
+        self.is_jupyter_debugger_shell = False
+        # checking if it's not a Jupyter Debug Session
+        ipython = self._get_ipython_or_none()
+        if ipython is None or not hasattr(ipython, 'debugger'):
+            self.interpreter = get_pydev_ipython_frontend(rpc_client)
+        else:
+            self.is_jupyter_debugger_shell = True
+            self.original_interactive_shell_instance = InteractiveShell._instance
+            self.interpreter = get_pydev_ipython_frontend(rpc_client, is_jupyter_debugger=True)
+        self._input_error_printed = False
+        self.notification_succeeded = False
+        self.notification_tries = 0
+        self.notification_max_tries = 3
+        self.show_banner = show_banner
+
+    def get_greeting_msg(self):
+        return self.interpreter.get_greeting_msg()
+
+    def do_add_exec(self, code_fragment):
+        self.notify_about_magic()
+        if code_fragment.text.rstrip().endswith('??'):
+            print('IPython-->')
+        try:
+            if self.is_jupyter_debugger_shell:
+                self.interpreter.ipython.execution_count = self.original_interactive_shell_instance.execution_count
+                InteractiveShell._instance = PyDebuggerTerminalInteractiveShell.new_instance
+                more, exception_occurred = self.interpreter.add_exec(code_fragment.text)
+                self.interpreter.ipython.execution_count += 1
+                self.original_interactive_shell_instance.execution_count = self.interpreter.ipython.execution_count
+            else:
+                more, exception_occurred = self.interpreter.add_exec(code_fragment.text)
+        finally:
+            if self.is_jupyter_debugger_shell:
+                InteractiveShell._instance = self.original_interactive_shell_instance
+            if code_fragment.text.rstrip().endswith('??'):
+                print('<--IPython')
+        return bool(more), exception_occurred
+
+    def get_namespace(self):
+        return self.interpreter.get_namespace()
+
+    def close(self):
+        sys.exit(0)
+
+    def notify_about_magic(self):
+        pass
+
+    def get_ipython_hidden_vars_dict(self):
+        if hasattr(self.interpreter, 'ipython'):
+            shell_ns_hidden_dict = get_ipython_hidden_vars(self.interpreter.ipython)
+            global_ns_hidden_dict = None
+            if self.is_jupyter_debugger_shell:
+                try:
+                    ipython = self._get_ipython_or_none()
+                    if ipython is not None:
+                        global_ns_hidden_dict = get_ipython_hidden_vars(ipython)
+                except:
+                    pass
+
+                if global_ns_hidden_dict is not None:
+                    shell_ns_hidden_dict.update(global_ns_hidden_dict)
+
+            return shell_ns_hidden_dict
+
+    def _get_ipython_or_none(self):
+        ipython = None
+
+        try:
+            ipython = get_ipython()
+        except:
+            pass
+
+        return ipython

{pydevd-pycharm-222.2270.35 → pydevd-pycharm-241.15989.57}/_pydev_bundle/pydev_ipython_console.py

@@ -24,8 +24,6 @@ class IPythonInterpreterInterface(BaseInterpreterInterface):
         self.show_banner = show_banner
 
     def get_greeting_msg(self):
-        if self.show_banner:
-            self.interpreter.show_banner()
         return self.interpreter.get_greeting_msg()
 
     def do_add_exec(self, code_fragment):

{pydevd-pycharm-222.2270.35 → pydevd-pycharm-241.15989.57}/_pydev_bundle/pydev_ipython_console_011.py

@@ -19,6 +19,7 @@ import os
 import sys
 import codeop
 import traceback
+from copy import deepcopy
 
 from IPython.core.error import UsageError
 from IPython.core.interactiveshell import InteractiveShell, InteractiveShellABC
@@ -27,7 +28,7 @@ from IPython.core.formatters import DisplayFormatter
 from IPython.core import release
 
 from IPython.terminal.interactiveshell import TerminalInteractiveShell
-from IPython.terminal.ipapp import load_default_config
+from IPython.terminal.ipapp import TerminalIPythonApp
 from IPython import InteractiveShell
 
 from traitlets import Type
@@ -35,6 +36,7 @@ from traitlets import CBool, Unicode
 
 
 from _pydevd_bundle.pydevd_constants import dict_keys, dict_iter_items
+from _pydevd_bundle.pydevd_ipython_console_output import PyDevDebugDisplayHook, PyDevDebugDisplayPub
 from _pydev_bundle.pydev_ipython_rich_output import PyDevDisplayHook, PyDevDisplayPub, \
     patch_stdout
 from _pydev_bundle.pydev_ipython_completer import init_shell_completer
@@ -110,6 +112,7 @@ class PyDevTerminalInteractiveShell(TerminalInteractiveShell):
     # Since IPython 5 the terminal interface is not compatible with Emacs `inferior-shell` and
     # the `simple_prompt` flag is needed
     simple_prompt = CBool(True)
+    pydev_curr_exec_line = 0
     
     if INLINE_OUTPUT_SUPPORTED:
         displayhook_class = Type(PyDevDisplayHook)
@@ -227,7 +230,39 @@ class PyDevTerminalInteractiveShell(TerminalInteractiveShell):
         super(PyDevTerminalInteractiveShell, self).init_magics()
         # TODO Any additional magics for PyDev?
 
+
+class PyDebuggerTerminalInteractiveShell(PyDevTerminalInteractiveShell):
+    """
+    InteractiveShell for the Jupyter Debug Console.
+    Print result outputs to the shell.
+    See method 'do_add_exec' from  'pydev/_pydev_bundle/pydev_ipython_code_executor.py'.
+    """
+
+    displayhook_class = Type(PyDevDebugDisplayHook)
+    display_pub_class = Type(PyDevDebugDisplayPub)
+    new_instance = None
+
+
 InteractiveShellABC.register(PyDevTerminalInteractiveShell)  # @UndefinedVariable
+InteractiveShellABC.register(PyDebuggerTerminalInteractiveShell)
+
+class PyDevIpythonApp(TerminalIPythonApp):
+    def initialize(self, shell_cls):
+        """Do actions after construct, but before starting the app."""
+        cl_config = deepcopy(self.config)
+        self.init_profile_dir()
+        self.init_config_files()
+        self.load_config_file()
+        self.update_config(cl_config)
+        self.init_path()
+        self.init_shell(shell_cls)
+        self.init_extensions()
+        self.init_code()
+
+    def init_shell(self, shell_cls):
+        self.shell = shell_cls.instance()
+        self.shell.configurables.append(self)
+
 
 #=======================================================================================================================
 # _PyDevIPythonFrontEnd
@@ -236,18 +271,39 @@ class _PyDevIPythonFrontEnd:
 
     version = release.__version__
 
-    def __init__(self):
+    def __init__(self, is_jupyter_debugger=False):
         # Create and initialize our IPython instance.
-        if hasattr(PyDevTerminalInteractiveShell, '_instance') and PyDevTerminalInteractiveShell._instance is not None:
-            self.ipython = PyDevTerminalInteractiveShell._instance
+        self.is_jupyter_debugger = is_jupyter_debugger
+        if is_jupyter_debugger:
+            if self._has_shell_instance(PyDebuggerTerminalInteractiveShell, 'new_instance'):
+                self.ipython = PyDebuggerTerminalInteractiveShell.new_instance
+            else:
+                # if we already have some InteractiveConsole instance (Python Console: Attach Debugger)
+                if self._has_shell_instance(PyDevTerminalInteractiveShell, '_instance'):
+                    PyDevTerminalInteractiveShell.clear_instance()
+
+                InteractiveShell.clear_instance()
+
+                self.ipython = self._init_ipy_app(PyDebuggerTerminalInteractiveShell).shell
+                PyDebuggerTerminalInteractiveShell.new_instance = PyDebuggerTerminalInteractiveShell._instance
         else:
-            self.ipython = PyDevTerminalInteractiveShell.instance(config=load_default_config())
+            if self._has_shell_instance(PyDevTerminalInteractiveShell, '_instance'):
+                self.ipython = PyDevTerminalInteractiveShell._instance
+            else:
+                self.ipython = self._init_ipy_app(PyDevTerminalInteractiveShell).shell
 
         self._curr_exec_line = 0
         self._curr_exec_lines = []
 
-    def show_banner(self):
-        self.ipython.show_banner()
+    def _init_ipy_app(self, shell_cls):
+        application = PyDevIpythonApp()
+        application.initialize(shell_cls)
+        return application
+
+
+    def _has_shell_instance(self, shell_cls, instance_str):
+        return getattr(shell_cls, instance_str, None) is not None
+
 
     def update(self, globals, locals):
         ns = self.ipython.user_ns
@@ -360,6 +416,7 @@ class _PyDevIPythonFrontEnd:
 
             if self.is_complete(buf):
                 self._curr_exec_line += 1
+                self.ipython.pydev_curr_exec_line = self._curr_exec_line
                 res = self.ipython.run_cell(buf)
                 del self._curr_exec_lines[:]
                 if res.error_in_exec is not None:
@@ -376,16 +433,15 @@ class _PyDevIPythonFrontEnd:
                 return True, False #needs more
             else:
                 self._curr_exec_line += 1
-                res = self.ipython.run_cell(line, store_history=True)
+                self.ipython.pydev_curr_exec_line = self._curr_exec_line
+                if not self.is_jupyter_debugger:
+                    res = self.ipython.run_cell(line, store_history=True)
+                else:
+                    res = self.ipython.run_cell(line, store_history=False)
                 if res.error_in_exec is not None:
                     return False, True
                 else:
                     return False, False #execute complete (no more)
-                #hist = self.ipython.history_manager.output_hist_reprs
-                #rep = hist.get(self._curr_exec_line, None)
-                #if rep is not None:
-                #    print(rep)
-                return False #execute complete (no more)
 
     def is_automagic(self):
         return self.ipython.automagic
@@ -398,14 +454,22 @@ class _PyDevFrontEndContainer:
     _instance = None
     _last_rpc_client = None
 
+class _PyDebuggerFrontEndContainer:
+    _instance = None
 
 def get_client():
     return _PyDevFrontEndContainer._last_rpc_client
 
 
-def get_pydev_ipython_frontend(rpc_client):
+def get_pydev_ipython_frontend(rpc_client, is_jupyter_debugger=False):
+    if is_jupyter_debugger:
+        if _PyDebuggerFrontEndContainer._instance is None:
+            _PyDebuggerFrontEndContainer._instance = _PyDevIPythonFrontEnd(is_jupyter_debugger)
+
+        return _PyDebuggerFrontEndContainer._instance
+
     if _PyDevFrontEndContainer._instance is None:
-        _PyDevFrontEndContainer._instance = _PyDevIPythonFrontEnd()
+        _PyDevFrontEndContainer._instance = _PyDevIPythonFrontEnd(is_jupyter_debugger)
 
     if _PyDevFrontEndContainer._last_rpc_client != rpc_client:
         _PyDevFrontEndContainer._last_rpc_client = rpc_client

{pydevd-pycharm-222.2270.35 → pydevd-pycharm-241.15989.57}/_pydev_bundle/pydev_ipython_rich_output.py

@@ -13,7 +13,7 @@ class PyDevDisplayHook(DisplayHook):
                                                             **kwargs)
             return
         add_new_line_to_text(format_dict)
-        format_dict["execution_count"] = str(self.shell.execution_count)
+        format_dict["execution_count"] = str(get_current_exec_count(self.shell))
         send_rich_output(format_dict)
 
 
@@ -24,10 +24,17 @@ class PyDevDisplayPub(DisplayPublisher):
             super(PyDevDisplayPub, self).publish(data, *args, **kwargs)
             return
         add_new_line_to_text(data)
-        data["execution_count"] = str(self.shell.execution_count)
+        data["execution_count"] = str(get_current_exec_count(self.shell))
         send_rich_output(data)
 
 
+def get_current_exec_count(shell):
+    if hasattr(shell, "pydev_curr_exec_line") and shell.pydev_curr_exec_line != 0:
+        return shell.pydev_curr_exec_line
+    else:
+        return shell.execution_count
+
+
 def add_new_line_to_text(format_dict):
     if "text/plain" in format_dict:
         text = format_dict["text/plain"]

{pydevd-pycharm-222.2270.35 → pydevd-pycharm-241.15989.57}/_pydev_bundle/pydev_log.py

@@ -1,7 +1,7 @@
 import sys
 from _pydevd_bundle.pydevd_constants import DebugInfoHolder
 from _pydev_imps._pydev_saved_modules import threading
-currentThread = threading.currentThread
+currentThread = threading.current_thread
 
 
 import traceback

{pydevd-pycharm-222.2270.35 → pydevd-pycharm-241.15989.57}/_pydev_bundle/pydev_monkey.py

@@ -3,8 +3,9 @@ import os
 import sys
 import traceback
 from _pydev_imps._pydev_saved_modules import threading
-from _pydevd_bundle.pydevd_constants import get_global_debugger, IS_WINDOWS, IS_MACOS, IS_JYTHON, IS_PY36_OR_LESSER, IS_PY38_OR_GREATER, \
-    get_current_thread_id
+from _pydevd_bundle.pydevd_constants import get_global_debugger, IS_WINDOWS, IS_MACOS, \
+    IS_JYTHON, IS_PY36_OR_LESSER, IS_PY36_OR_GREATER, IS_PY38_OR_GREATER, \
+    get_current_thread_id, IS_PY311_OR_GREATER, clear_cached_thread_id
 from _pydev_bundle import pydev_log
 
 try:
@@ -62,6 +63,16 @@ def _is_already_patched(args):
 def _is_py3_and_has_bytes_args(args):
     if not isinstance('', type(u'')):
         return False
+
+    if len(args) == 0:
+        return False
+
+    # PY-57217 Uvicorn with '-reload' flag when starting a new process in Python3.11 passes the path to the interpreter as bytes
+    if IS_PY311_OR_GREATER and isinstance(args[0], bytes):
+        interpreter = args[0].decode('utf-8')
+        if is_python(interpreter):
+            args[0] = interpreter
+
     for arg in args:
         if isinstance(arg, bytes):
             return True
@@ -70,7 +81,9 @@ def _is_py3_and_has_bytes_args(args):
 
 def _on_forked_process():
     import pydevd
-    pydevd.threadingCurrentThread().__pydevd_main_thread = True
+    main_thread = pydevd.threadingCurrentThread()
+    main_thread.__pydevd_main_thread = True
+    clear_cached_thread_id(main_thread)
     pydevd.settrace_forked()
 
 
@@ -108,6 +121,8 @@ def starts_with_python_shebang(path):
 
 
 def is_python(path):
+    if IS_PY36_OR_GREATER and isinstance(path, os.PathLike):
+        path = path.__fspath__()
     if path.endswith("'") or path.endswith('"'):
         path = path[1:len(path) - 1]
     filename = os.path.basename(path).lower()
@@ -229,6 +244,16 @@ def patch_args(args):
             return args
 
         i = 1
+        # Implementation-specific options that start with `-X` can be passed right
+        # after the Python executable. We have to preserve them.
+        while i < len(args) and args[i].startswith('-X'):
+            new_args.append(args[i])
+            if args[i] == '-X':
+                if i < len(args) - 1:
+                    new_args.append(args[i + 1])
+                    i += 1
+            i += 1
+
         # Original args should be something as:
         # ['X:\\pysrc\\pydevd.py', '--multiprocess', '--print-in-debugger-startup',
         #  '--vm_type', 'python', '--client', '127.0.0.1', '--port', '56352', '--file', 'x:\\snippet1.py']
@@ -448,7 +473,6 @@ def create_execl(original_name):
         import os
         args = patch_args(args)
         if is_python_args(args):
-            path = args[0]
             send_process_will_be_substituted()
         return getattr(os, original_name)(path, *args)
     return new_execl
@@ -463,7 +487,6 @@ def create_execv(original_name):
         import os
         args = patch_args(args)
         if is_python_args(args):
-            path = args[0]
             send_process_will_be_substituted()
         return getattr(os, original_name)(path, args)
     return new_execv
@@ -478,7 +501,6 @@ def create_execve(original_name):
         import os
         args = patch_args(args)
         if is_python_args(args):
-            path = args[0]
             send_process_will_be_substituted()
         return getattr(os, original_name)(path, args, env)
     return new_execve
@@ -773,12 +795,12 @@ class _NewThreadStartupWithTrace:
             # Note: if this is a thread from threading.py, we're too early in the boostrap process (because we mocked
             # the start_new_thread internal machinery and thread._bootstrap has not finished), so, the code below needs
             # to make sure that we use the current thread bound to the original function and not use
-            # threading.currentThread() unless we're sure it's a dummy thread.
+            # threading.current_thread() unless we're sure it's a dummy thread.
             t = getattr(self.original_func, '__self__', getattr(self.original_func, 'im_self', None))
             if not isinstance(t, threading.Thread):
                 # This is not a threading.Thread but a Dummy thread (so, get it as a dummy thread using
                 # currentThread).
-                t = threading.currentThread()
+                t = threading.current_thread()
 
             if not getattr(t, 'is_pydev_daemon_thread', False):
                 thread_id = get_current_thread_id(t)

{pydevd-pycharm-222.2270.35 → pydevd-pycharm-241.15989.57}/_pydev_bundle/pydev_monkey_qt.py

@@ -38,35 +38,53 @@ def patch_qt(qt_support_mode):
 
         patch_qt_on_import = None
         try:
-            # PY-50959
-            # Problem:
-            # 1. We have Python 3.8;
-            # 2. PyQt compatible = Auto or PySide2;
-            # 3. We try to import numpy, we get "AttributeError: module 'numpy.core' has no attribute 'numerictypes'"
-            #
-            # Solution:
-            # We decided to turn off patching for PySide2 if we have Python 3.8
-            # Here we skip 'import PySide2' and keep trying to import another qt libraries
             if IS_PY38:
                 raise ImportError
-            import PySide2  # @UnresolvedImport @UnusedImport
-            qt_support_mode = 'pyside2'
+            import PySide6
+            qt_support_mode = 'pyside6'
         except:
             try:
-                import Pyside  # @UnresolvedImport @UnusedImport
-                qt_support_mode = 'pyside'
+                # PY-50959
+                # Problem:
+                # 1. We have Python 3.8;
+                # 2. PyQt compatible = Auto or PySide2;
+                # 3. We try to import numpy, we get "AttributeError: module 'numpy.core' has no attribute 'numerictypes'"
+                #
+                # Solution:
+                # We decided to turn off patching for PySide2 if we have Python 3.8
+                # Here we skip 'import PySide2' and keep trying to import another qt libraries
+                if IS_PY38:
+                    raise ImportError
+                import PySide2  # @UnresolvedImport @UnusedImport
+                qt_support_mode = 'pyside2'
             except:
                 try:
-                    import PyQt5  # @UnresolvedImport @UnusedImport
-                    qt_support_mode = 'pyqt5'
+                    import Pyside  # @UnresolvedImport @UnusedImport
+                    qt_support_mode = 'pyside'
                 except:
                     try:
-                        import PyQt4  # @UnresolvedImport @UnusedImport
-                        qt_support_mode = 'pyqt4'
+                        import PyQt6  # @UnresolvedImport @UnusedImport
+                        qt_support_mode = 'pyqt6'
                     except:
-                        return
-
-    if qt_support_mode == 'pyside2':
+                        try:
+                            import PyQt5  # @UnresolvedImport @UnusedImport
+                            qt_support_mode = 'pyqt5'
+                        except:
+                            try:
+                                import PyQt4  # @UnresolvedImport @UnusedImport
+                                qt_support_mode = 'pyqt4'
+                            except:
+                                return
+
+    if qt_support_mode == 'pyside6':
+        if IS_PY38:
+            return
+        try:
+            import PySide6.QtCore  # @UnresolvedImport
+            _internal_patch_qt(PySide6.QtCore, qt_support_mode)
+        except:
+            return
+    elif qt_support_mode == 'pyside2':
         # PY-50959
         # We can get here only if PyQt compatible = PySide2, in this case we should return
         # See comment above about PY-50959
@@ -85,6 +103,13 @@ def patch_qt(qt_support_mode):
         except:
             return
 
+    elif qt_support_mode == 'pyqt6':
+        try:
+            import PyQt6.QtCore  # @UnresolvedImport
+            _internal_patch_qt(PyQt6.QtCore)
+        except:
+            return
+
     elif qt_support_mode == 'pyqt5':
         try:
             import PyQt5.QtCore  # @UnresolvedImport
@@ -163,14 +188,17 @@ def _internal_patch_qt(QtCore, qt_support_mode='auto'):
             QtCore.QObject.__init__(self)
             self.thread = thread
             self.original_started = original_started
-            if qt_support_mode in ('pyside', 'pyside2'):
+            if qt_support_mode in ('pyside', 'pyside2', 'pyside6'):
                 self._signal = original_started
             else:
                 self._signal.connect(self._on_call)
                 self.original_started.connect(self._signal)
 
         def connect(self, func, *args, **kwargs):
-            if qt_support_mode in ('pyside', 'pyside2'):
+            _is_signal_instance = False
+            if hasattr(QtCore, 'SignalInstance'):
+                _is_signal_instance = isinstance(func, QtCore.SignalInstance)
+            if qt_support_mode in ('pyside', 'pyside2', 'pyside6') and not _is_signal_instance:
                 return self._signal.connect(FuncWrapper(func), *args, **kwargs)
             else:
                 return self._signal.connect(func, *args, **kwargs)

{pydevd-pycharm-222.2270.35 → pydevd-pycharm-241.15989.57}/_pydev_bundle/pydev_umd.py

@@ -156,8 +156,7 @@ def runfile(filename, args=None, wdir=None, is_module=False, global_vars=None):
 
     if global_vars is None:
         m = save_main_module(filename, 'pydev_umd')
-        global_vars = _get_interpreter_globals()
-        global_vars.update(m.__dict__)
+        global_vars = m.__dict__
         try:
             global_vars['__builtins__'] = __builtins__
         except NameError:

{pydevd-pycharm-222.2270.35 → pydevd-pycharm-241.15989.57}/_pydevd_bundle/pydevd_additional_thread_info_regular.py

@@ -7,7 +7,7 @@ from _pydev_bundle import pydev_log
 from _pydevd_bundle.pydevd_frame import PyDBFrame
 # ENDIF
 
-version = 33
+version = 46
 
 if not hasattr(sys, '_current_frames'):