From: Nikita Sobolev <mail@sobolevn.me>
Date: Sat, 8 Jan 2022 20:13:42 +0000 (+0300)
Subject: bpo-46306: simplify `CodeType` attribute access in `doctest.py` (GH-30481)
X-Git-Tag: v3.11.0a4~45
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0fc58c1e051026baff4919d8519ce2aabe3b2ba1;p=thirdparty%2FPython%2Fcpython.git

bpo-46306: simplify `CodeType` attribute access in `doctest.py` (GH-30481)

Assume co_firstlineno always exists on types.CodeType objects.

Co-authored-by: Kumar Aditya <59607654+kumaraditya303@users.noreply.github.com>
---

diff --git a/Lib/doctest.py b/Lib/doctest.py
index b27cbdfed46f..4735b5985268 100644
--- a/Lib/doctest.py
+++ b/Lib/doctest.py
@@ -1113,7 +1113,7 @@ class DocTestFinder:
         if inspect.istraceback(obj): obj = obj.tb_frame
         if inspect.isframe(obj): obj = obj.f_code
         if inspect.iscode(obj):
-            lineno = getattr(obj, 'co_firstlineno', None)-1
+            lineno = obj.co_firstlineno - 1
 
         # Find the line number where the docstring starts.  Assume
         # that it's the first line that begins with a quote mark.
diff --git a/Misc/NEWS.d/next/Library/2022-01-08-13-53-25.bpo-46306.1_es8z.rst b/Misc/NEWS.d/next/Library/2022-01-08-13-53-25.bpo-46306.1_es8z.rst
new file mode 100644
index 000000000000..02943c95a7d7
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-01-08-13-53-25.bpo-46306.1_es8z.rst
@@ -0,0 +1,2 @@
+Assume that :class:`types.CodeType` always has :attr:`types.CodeType.co_firstlineno` in
+:mod:`doctest`.