handle decreasing and increasing line numbers from dis.findlinestarts

https://docs.python.org/3/library/dis.html#dis.findlinestarts
debugmm · Mar 2, 2021 · 37520e2 · 37520e2
1 parent 0a53b42
commit 37520e2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 15 deletions.
diff --git a/src/twisted/python/deprecate.py b/src/twisted/python/deprecate.py
@@ -604,22 +604,16 @@ def warnAboutFunction(offender, warningString):
     # inspect.getmodule() is attractive, but somewhat
     # broken in Python < 2.6.  See Python bug 4845.
     offenderModule = sys.modules[offender.__module__]
-    filename = inspect.getabsfile(offenderModule)
-    lineStarts = list(findlinestarts(offender.__code__))
-    lastLineNo = lineStarts[-1][1]
-    globals = offender.__globals__
-
-    kwargs = dict(
+    warn_explicit(
+        warningString,
         category=DeprecationWarning,
-        filename=filename,
-        lineno=lastLineNo,
+        filename=inspect.getabsfile(offenderModule),
+        lineno=max(lineNumber for _, lineNumber in findlinestarts(offender.__code__)),
         module=offenderModule.__name__,
-        registry=globals.setdefault("__warningregistry__", {}),
+        registry=offender.__globals__.setdefault("__warningregistry__", {}),
         module_globals=None,
     )
 
-    warn_explicit(warningString, **kwargs)
-
 
 def _passedArgSpec(argspec, positional, keyword):
     """

diff --git a/src/twisted/trial/_synctest.py b/src/twisted/trial/_synctest.py
@@ -1154,10 +1154,11 @@ def flushWarnings(self, offendingFunctions=None):
 
                     if filename != os.path.normcase(aWarning.filename):
                         continue
-                    lineStarts = list(_findlinestarts(aFunction.__code__))
-                    first = lineStarts[0][1]
-                    last = lineStarts[-1][1]
-                    if not (first <= aWarning.lineno <= last):
+                    lineNumbers = [
+                        lineNumber
+                        for _, lineNumber in _findlinestarts(aFunction.__code__)
+                    ]
+                    if not (min(lineNumbers) <= aWarning.lineno <= max(lineNumbers)):
                         continue
                     # The warning points to this function, flush it and move on
                     # to the next warning.