From a6e59719ec611a012227719e7d3ed1730601cca9 Mon Sep 17 00:00:00 2001 From: Ka-Ping Yee Date: Sat, 10 Mar 2001 09:31:55 +0000 Subject: [PATCH] Fix findsource() to work for derived classes. --- Lib/inspect.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Lib/inspect.py b/Lib/inspect.py index deccabdcd75..a7c78597da3 100644 --- a/Lib/inspect.py +++ b/Lib/inspect.py @@ -27,7 +27,7 @@ __author__ = 'Ka-Ping Yee ' __date__ = '1 Jan 2001' -import sys, os, types, string, dis, imp, tokenize +import sys, os, types, string, re, dis, imp, tokenize # ----------------------------------------------------------- type-checking def ismodule(object): @@ -259,10 +259,9 @@ def findsource(object): if isclass(object): name = object.__name__ - matches = (['class', name], ['class', name + ':']) + pat = re.compile(r'^\s*class\s*' + name + r'\b') for i in range(len(lines)): - if string.split(lines[i])[:2] in matches: - return lines, i + if pat.match(lines[i]): return lines, i else: raise IOError, 'could not find class definition' if ismethod(object): @@ -277,8 +276,9 @@ def findsource(object): if not hasattr(object, 'co_firstlineno'): raise IOError, 'could not find function definition' lnum = object.co_firstlineno - 1 + pat = re.compile(r'^\s*def\s') while lnum > 0: - if string.split(lines[lnum])[:1] == ['def']: break + if pat.match(lines[lnum]): break lnum = lnum - 1 return lines, lnum