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

{pydevd-pycharm-222.4554.3 → pydevd-pycharm-241.15989.57}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: pydevd-pycharm
-Version: 222.4554.3
+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.4554.3 → 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.4554.3 → 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())
@@ -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.4554.3 → 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.4554.3 → 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
@@ -228,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
@@ -237,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
@@ -379,7 +434,10 @@ class _PyDevIPythonFrontEnd:
             else:
                 self._curr_exec_line += 1
                 self.ipython.pydev_curr_exec_line = self._curr_exec_line
-                res = self.ipython.run_cell(line, store_history=True)
+                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:
@@ -396,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.4554.3 → pydevd-pycharm-241.15989.57}/_pydev_bundle/pydev_monkey.py

@@ -5,7 +5,7 @@ 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_PY36_OR_GREATER, IS_PY38_OR_GREATER, \
-    get_current_thread_id
+    get_current_thread_id, IS_PY311_OR_GREATER, clear_cached_thread_id
 from _pydev_bundle import pydev_log
 
 try:
@@ -63,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
@@ -71,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()
 
 
@@ -232,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']
@@ -451,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
@@ -466,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
@@ -481,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

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

@@ -195,7 +195,10 @@ def _internal_patch_qt(QtCore, qt_support_mode='auto'):
                 self.original_started.connect(self._signal)
 
         def connect(self, func, *args, **kwargs):
-            if qt_support_mode in ('pyside', 'pyside2', 'pyside6'):
+            _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.4554.3 → 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.4554.3 → 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 = 35
+version = 46
 
 if not hasattr(sys, '_current_frames'):
 

pydevd-pycharm-241.15989.57/_pydevd_bundle/pydevd_asyncio_provider.py

@@ -0,0 +1,39 @@
+#  Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+def get_apply():
+    try:
+        from pydevd_nest_asyncio import apply
+        return apply
+    except:
+        return None
+
+
+def get_eval_async_expression_in_context():
+    try:
+        from pydevd_asyncio_utils import eval_async_expression_in_context
+        return eval_async_expression_in_context
+    except:
+        return None
+
+
+def get_eval_async_expression():
+    try:
+        from pydevd_asyncio_utils import eval_async_expression
+        return eval_async_expression
+    except:
+        return None
+
+
+def get_exec_async_code():
+    try:
+        from pydevd_asyncio_utils import exec_async_code
+        return exec_async_code
+    except:
+        return None
+
+
+def get_asyncio_command_compiler():
+    try:
+        from pydevd_asyncio_utils import asyncio_command_compiler
+        return asyncio_command_compiler
+    except:
+        return None

{pydevd-pycharm-222.4554.3 → pydevd-pycharm-241.15989.57}/_pydevd_bundle/pydevd_breakpoints.py

@@ -5,7 +5,7 @@ from _pydev_bundle import pydev_log
 from _pydevd_bundle import pydevd_import_class
 from _pydevd_bundle.pydevd_frame_utils import add_exception_to_frame
 from _pydev_imps._pydev_saved_modules import threading
-
+from _pydevd_bundle.pydevd_utils import eval_expression
 
 class ExceptionBreakpoint(object):
 
@@ -38,6 +38,15 @@ class ExceptionBreakpoint(object):
     def __str__(self):
         return self.qname
 
+    def __repr__(self):
+        return ("<ExceptionBreakpoint(qname=%r, condition=%r, expression=%r, "
+                "notify_on_handled_exceptions=%s, notify_on_unhandled_exceptions=%s, "
+                "notify_on_first_raise_only=%s, ignore_libraries=%s)>") % (
+            self.qname, self.condition, self.expression,
+            self.notify_on_handled_exceptions, self.notify_on_unhandled_exceptions,
+            self.notify_on_first_raise_only, self.ignore_libraries
+        )
+
     @property
     def has_condition(self):
         return self.condition is not None
@@ -71,7 +80,7 @@ class LineBreakpoint(object):
             self._hit_count += 1
             expr = self.hit_condition.replace('@HIT@', str(self._hit_count))
             try:
-                ret = bool(eval(expr, frame.f_globals, frame.f_locals))
+                ret = bool(eval_expression(expr, frame.f_globals, frame.f_locals))
             except Exception:
                 ret = False
         return ret

pydevd-pycharm-241.15989.57/_pydevd_bundle/pydevd_bytecode_utils.py

@@ -0,0 +1,53 @@
+"""Bytecode analyzing utils."""
+
+from _pydevd_bundle.smart_step_into import get_stepping_variants
+
+__all__ = [
+    'find_last_call_name',
+    'find_last_func_call_order',
+]
+
+
+def find_last_func_call_order(frame, start_line):
+    """Find the call order of the last function call between ``start_line``
+    and last executed instruction.
+
+    :param frame: A frame inside which we are looking the function call.
+    :type frame: :py:class:`types.FrameType`
+    :param start_line:
+    :return: call order or -1 if we fail to find the call order for some
+      reason.
+    :rtype: int
+    """
+    code = frame.f_code
+    lasti = frame.f_lasti
+    cache = {}
+    call_order = -1
+    for inst in get_stepping_variants(code):
+        if inst.offset > lasti:
+            break
+        if inst.lineno >= start_line:
+            name = inst.argval
+            call_order = cache.setdefault(name, -1)
+            call_order += 1
+            cache[name] = call_order
+    return call_order
+
+
+def find_last_call_name(frame):
+    """Find the name of the last call made in the frame.
+
+    :param frame: A frame inside which we are looking the last call.
+    :type frame: :py:class:`types.FrameType`
+    :return: The name of a function or method that has been called last.
+    :rtype: str
+    """
+    last_call_name = None
+    code = frame.f_code
+    last_instruction = frame.f_lasti
+    for inst in get_stepping_variants(code):
+        if inst.offset > last_instruction:
+            break
+        last_call_name = inst.argval
+
+    return last_call_name

{pydevd-pycharm-222.4554.3 → pydevd-pycharm-241.15989.57}/_pydevd_bundle/pydevd_collect_try_except_info.py

@@ -9,7 +9,7 @@ try:
 except NameError:
     xrange = range
 
-from _pydevd_bundle.pydevd_constants import IS_PY38_OR_GREATER
+from _pydevd_bundle.pydevd_constants import IS_PY38_OR_GREATER, IS_PY312_OR_GREATER
 
 
 class TryExceptInfo(object):
@@ -145,6 +145,10 @@ def _iter_instructions(co):
             yield instruction
 
 
+_return_op_names = {'RETURN_VALUE', 'RETURN_CONST'} if IS_PY312_OR_GREATER \
+    else {'RETURN_VALUE'}
+
+
 def collect_return_info(co, use_func_first_line=False):
     if not hasattr(co, 'co_lnotab'):
         return []
@@ -158,7 +162,7 @@ def collect_return_info(co, use_func_first_line=False):
     op_offset_to_line = dict(dis.findlinestarts(co))
     for instruction in _iter_instructions(co):
         curr_op_name = instruction.opname
-        if curr_op_name == 'RETURN_VALUE':
+        if curr_op_name in _return_op_names:
             lst.append(ReturnInfo(_get_line(op_offset_to_line, instruction.offset, firstlineno, search=True)))
 
     return lst