Skip to content

Commit 7fb2041

Browse files
serhiy-storchakablhsing
authored andcommitted
pythongh-122981: Fix inspect.getsource() for generated classes with Python base classes (pythonGH-123001)
Look up __firstlineno__ only in the class' dict, without searching in base classes.
1 parent 8aa0eba commit 7fb2041

File tree

4 files changed

+66
-4
lines changed

4 files changed

+66
-4
lines changed

Lib/inspect.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -970,10 +970,10 @@ def findsource(object):
970970

971971
if isclass(object):
972972
try:
973-
firstlineno = object.__firstlineno__
974-
except AttributeError:
973+
firstlineno = vars(object)['__firstlineno__']
974+
except (TypeError, KeyError):
975975
raise OSError('source code not available')
976-
return lines, object.__firstlineno__ - 1
976+
return lines, firstlineno - 1
977977

978978
if ismethod(object):
979979
object = object.__func__

Lib/test/test_inspect/inspect_fodder2.py

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -315,3 +315,45 @@ def g():
315315
class ClassWithCodeObject:
316316
import sys
317317
code = sys._getframe(0).f_code
318+
319+
import enum
320+
321+
# line 321
322+
class enum322(enum.Enum):
323+
A = 'a'
324+
325+
# line 325
326+
class enum326(enum.IntEnum):
327+
A = 1
328+
329+
# line 329
330+
class flag330(enum.Flag):
331+
A = 1
332+
333+
# line 333
334+
class flag334(enum.IntFlag):
335+
A = 1
336+
337+
# line 337
338+
simple_enum338 = enum.Enum('simple_enum338', 'A')
339+
simple_enum339 = enum.IntEnum('simple_enum339', 'A')
340+
simple_flag340 = enum.Flag('simple_flag340', 'A')
341+
simple_flag341 = enum.IntFlag('simple_flag341', 'A')
342+
343+
import typing
344+
345+
# line 345
346+
class nt346(typing.NamedTuple):
347+
x: int
348+
y: int
349+
350+
# line 350
351+
nt351 = typing.NamedTuple('nt351', (('x', int), ('y', int)))
352+
353+
# line 353
354+
class td354(typing.TypedDict):
355+
x: int
356+
y: int
357+
358+
# line 358
359+
td359 = typing.TypedDict('td359', (('x', int), ('y', int)))

Lib/test/test_inspect/test_inspect.py

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -821,7 +821,7 @@ def test_getsource_on_code_object(self):
821821
self.assertSourceEqual(mod.eggs.__code__, 12, 18)
822822

823823
def test_getsource_on_generated_class(self):
824-
A = type('A', (), {})
824+
A = type('A', (unittest.TestCase,), {})
825825
self.assertEqual(inspect.getsourcefile(A), __file__)
826826
self.assertEqual(inspect.getfile(A), __file__)
827827
self.assertIs(inspect.getmodule(A), sys.modules[__name__])
@@ -929,6 +929,24 @@ def test_anonymous(self):
929929
# as argument to another function.
930930
self.assertSourceEqual(mod2.anonymous, 55, 55)
931931

932+
def test_enum(self):
933+
self.assertSourceEqual(mod2.enum322, 322, 323)
934+
self.assertSourceEqual(mod2.enum326, 326, 327)
935+
self.assertSourceEqual(mod2.flag330, 330, 331)
936+
self.assertSourceEqual(mod2.flag334, 334, 335)
937+
self.assertRaises(OSError, inspect.getsource, mod2.simple_enum338)
938+
self.assertRaises(OSError, inspect.getsource, mod2.simple_enum339)
939+
self.assertRaises(OSError, inspect.getsource, mod2.simple_flag340)
940+
self.assertRaises(OSError, inspect.getsource, mod2.simple_flag341)
941+
942+
def test_namedtuple(self):
943+
self.assertSourceEqual(mod2.nt346, 346, 348)
944+
self.assertRaises(OSError, inspect.getsource, mod2.nt351)
945+
946+
def test_typeddict(self):
947+
self.assertSourceEqual(mod2.td354, 354, 356)
948+
self.assertRaises(OSError, inspect.getsource, mod2.td359)
949+
932950
class TestBlockComments(GetSourceBase):
933951
fodderModule = mod
934952

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Fix :func:`inspect.getsource` for generated classes with Python base classes
2+
(e.g. enums).

0 commit comments

Comments
 (0)