cpython: ac86e5b2d45b (original) (raw)

Mercurial > cpython

changeset 95669:ac86e5b2d45b

Issue #21217: inspect.getsourcelines() now tries to compute the start and end lines from the code object, fixing an issue when a lambda function is used as decorator argument. Patch by Thomas Ballinger. [#21217]

line wrap: on

line diff

--- a/Lib/inspect.py +++ b/Lib/inspect.py @@ -32,6 +32,7 @@ Here are some of the useful functions pr 'Yury Selivanov yselivanov@sprymix.com') import ast +import dis import enum import importlib.machinery import itertools @@ -49,18 +50,10 @@ from operator import attrgetter from collections import namedtuple, OrderedDict

Create constants for the compiler flags in Include/code.h

-# We try to get them from dis to avoid duplication, but fall -# back to hard-coding so the dependency is optional -try:

• from dis import COMPILER_FLAG_NAMES as _flag_names

-except ImportError:

• CO_OPTIMIZED, CO_NEWLOCALS = 0x1, 0x2
• CO_VARARGS, CO_VARKEYWORDS = 0x4, 0x8
• CO_NESTED, CO_GENERATOR, CO_NOFREE = 0x10, 0x20, 0x40

-else:

• mod_dict = globals()
• for k, v in _flag_names.items():

•    mod_dict["CO_" + v] = k[](#l1.26)

+# We try to get them from dis to avoid duplication +mod_dict = globals() +for k, v in dis.COMPILER_FLAG_NAMES.items():

• mod_dict["CO_" + v] = k

See Include/object.h

TPFLAGS_IS_ABSTRACT = 1 << 20 @@ -888,6 +881,14 @@ def getblock(lines): pass return lines[:blockfinder.last] +def _line_number_helper(code_obj, lines, lnum):

• """Return a list of source lines and starting line number for a code object.

+

• The arguments must be a code object with lines and lnum from findsource.
• """
• _, end_line = list(dis.findlinestarts(code_obj))[-1]
• return lines[lnum:end_line], lnum + 1

+ def getsourcelines(object): """Return a list of source lines and starting line number for an object. @@ -899,8 +900,16 @@ def getsourcelines(object): object = unwrap(object) lines, lnum = findsource(object)

• if ismodule(object): return lines, 0
• else: return getblock(lines[lnum:]), lnum + 1

• if ismodule(object):

•    return lines, 0[](#l1.56)

• elif iscode(object):

•    return _line_number_helper(object, lines, lnum)[](#l1.58)

• elif isfunction(object):

•    return _line_number_helper(object.__code__, lines, lnum)[](#l1.60)

• elif ismethod(object):

•    return _line_number_helper(object.__func__.__code__, lines, lnum)[](#l1.62)

• else:

•    return getblock(lines[lnum:]), lnum + 1[](#l1.64)

def getsource(object): """Return the text of the source code for an object.

--- a/Lib/test/inspect_fodder2.py +++ b/Lib/test/inspect_fodder2.py @@ -110,6 +110,14 @@ def annotated(arg1: list): def keyword_only_arg(*, arg): pass +@wrap(lambda: None) +def func114():

• return 115

+ +class ClassWithMethod:

• def method(self):

•    pass[](#l2.13)

+ from functools import wraps def decorator(func): @@ -118,7 +126,7 @@ def decorator(func): return 42 return fake -#line 121 +#line 129 @decorator def real(): return 20

--- a/Lib/test/test_inspect.py +++ b/Lib/test/test_inspect.py @@ -392,6 +392,9 @@ class TestRetrievingSourceCode(GetSource finally: linecache.getlines = getlines

• def test_getsource_on_code_object(self):

•    self.assertSourceEqual(mod.eggs.__code__, 12, 18)[](#l3.8)

+ class TestDecorators(GetSourceBase): fodderModule = mod2 @@ -402,7 +405,10 @@ class TestDecorators(GetSourceBase): self.assertSourceEqual(mod2.gone, 9, 10) def test_getsource_unwrap(self):

•    self.assertSourceEqual(mod2.real, 122, 124)[](#l3.17)

•    self.assertSourceEqual(mod2.real, 130, 132)[](#l3.18)

+

• def test_decorator_with_lambda(self):

•    self.assertSourceEqual(mod2.func114, 113, 115)[](#l3.21)

class TestOneliners(GetSourceBase): fodderModule = mod2 @@ -497,6 +503,9 @@ class TestBuggyCases(GetSourceBase): self.assertRaises(IOError, inspect.findsource, co) self.assertRaises(IOError, inspect.getsource, co)

• def test_getsource_on_method(self):

•    self.assertSourceEqual(mod2.ClassWithMethod.method, 118, 119)[](#l3.30)

+ class TestNoEOL(GetSourceBase): def init(self, *args, **kwargs): self.tempdir = TESTFN + '_dir'

--- a/Misc/ACKS +++ b/Misc/ACKS @@ -72,6 +72,7 @@ Dwayne Bailey Stig Bakken Greg Ball Luigi Ballabio +Thomas Ballinger Jeff Balogh Manuel Balsera Matt Bandy

--- a/Misc/NEWS +++ b/Misc/NEWS @@ -1,4 +1,4 @@ -+++++++++++ ++++++++++++ Python News +++++++++++ @@ -9,6 +9,7 @@ Release date: XXX Core and Builtins ----------------- +

• Issue #22631: Added Linux-specific socket constant CAN_RAW_FD_FRAMES. Patch courtesy of Joe Jevnik. @@ -31,6 +32,10 @@ Core and Builtins Library ------- +- Issue #21217: inspect.getsourcelines() now tries to compute the start and

• end lines from the code object, fixing an issue when a lambda function is
• used as decorator argument. Patch by Thomas Ballinger. +

• Issue #23811: Add missing newline to the PyCompileError error message. Patch by Alex Shkop.