From ff09ce211f8390bbcbb9d9bb2863ca97f63864c5 Mon Sep 17 00:00:00 2001
From: Alexander Belopolsky <alexander.belopolsky@gmail.com>
Date: Fri, 24 Sep 2010 18:03:12 +0000
Subject: Issue #9936: Fixed executable lines' search in the trace module.

---
 Lib/trace.py | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'Lib/trace.py')

diff --git a/Lib/trace.py b/Lib/trace.py
index 969b3961d0..bed983e95a 100644
--- a/Lib/trace.py
+++ b/Lib/trace.py
@@ -59,7 +59,7 @@ import token
 import tokenize
 import inspect
 import gc
-
+import dis
 import pickle
 
 def usage(outfile):
@@ -376,13 +376,7 @@ def find_lines_from_code(code, strs):
     """Return dict where keys are lines in the line number table."""
     linenos = {}
 
-    line_increments = code.co_lnotab[1::2]
-    table_length = len(line_increments)
-    docstring = False
-
-    lineno = code.co_firstlineno
-    for li in line_increments:
-        lineno += li
+    for _, lineno in dis.findlinestarts(code):
         if lineno not in strs:
             linenos[lineno] = 1
 
-- 
cgit v1.2.1