From 4f4913b38bba5e01fc0e7a26f4840bf342365d3d Mon Sep 17 00:00:00 2001 From: Yury Selivanov Date: Thu, 23 Jul 2015 17:10:00 +0300 Subject: Issue #24485: Revert backwards compatibility breaking changes of #21217. --- Lib/inspect.py | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) (limited to 'Lib/inspect.py') diff --git a/Lib/inspect.py b/Lib/inspect.py index 4c1ac1f283..24c8df7225 100644 --- a/Lib/inspect.py +++ b/Lib/inspect.py @@ -902,14 +902,6 @@ 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. @@ -921,16 +913,8 @@ def getsourcelines(object): object = unwrap(object) lines, lnum = findsource(object) - if ismodule(object): - return lines, 0 - elif iscode(object): - return _line_number_helper(object, lines, lnum) - elif isfunction(object): - return _line_number_helper(object.__code__, lines, lnum) - elif ismethod(object): - return _line_number_helper(object.__func__.__code__, lines, lnum) - else: - return getblock(lines[lnum:]), lnum + 1 + if ismodule(object): return lines, 0 + else: return getblock(lines[lnum:]), lnum + 1 def getsource(object): """Return the text of the source code for an object. -- cgit v1.2.1