diff -r 0a02c433f52d -r 5883ce99ee12 Utilities/ClassBrowsers/pyclbr.py --- a/Utilities/ClassBrowsers/pyclbr.py Fri Nov 01 15:48:48 2013 +0100 +++ b/Utilities/ClassBrowsers/pyclbr.py Sun Nov 03 15:58:22 2013 +0100 @@ -106,7 +106,7 @@ | (?P<CodingLine> ^ \# \s* [*_-]* \s* coding[:=] \s* (?P<Coding> [-\w_.]+ ) \s* [*_-]* $ ) -""", re.VERBOSE | re.DOTALL | re.MULTILINE).search +""", re.VERBOSE | re.DOTALL | re.MULTILINE).search # __IGNORE_WARNING__ _commentsub = re.compile(r"""#[^\n]*\n|#[^\n]*$""").sub @@ -203,7 +203,7 @@ self.name = '__all__' self.file = file self.lineno = lineno - self.identifiers = [e.replace('"', '').replace("'", "").strip() \ + self.identifiers = [e.replace('"', '').replace("'", "").strip() for e in idents.split(',')] @@ -239,7 +239,7 @@ if inpackage: try: f, file, (suff, mode, type) = \ - ClassBrowsers.find_module(module, path) + ClassBrowsers.find_module(module, path) except ImportError: f = None if f is None: @@ -253,7 +253,7 @@ _modules[module] = dict path = [file] + path f, file, (suff, mode, type) = \ - ClassBrowsers.find_module('__init__', [file]) + ClassBrowsers.find_module('__init__', [file]) if f: f.close() if type not in SUPPORTED_TYPES: @@ -318,14 +318,14 @@ thisindent -= deltaindent else: while conditionalsstack and \ - conditionalsstack[-1] >= thisindent: + conditionalsstack[-1] >= thisindent: del conditionalsstack[-1] if deltastack: del deltastack[-1] deltaindentcalculated = 0 # close all classes indented at least as much while classstack and \ - classstack[-1][1] >= thisindent: + classstack[-1][1] >= thisindent: if classstack[-1][0] is not None: # record the end line classstack[-1][0].setEndLine(lineno - 1) @@ -370,7 +370,7 @@ thisindent = _indent(m.group("ClassIndent")) # close all classes indented at least as much while classstack and \ - classstack[-1][1] >= thisindent: + classstack[-1][1] >= thisindent: if classstack[-1][0] is not None: # record the end line classstack[-1][0].setEndLine(lineno - 1) @@ -475,7 +475,7 @@ # a conditional function/method definition thisindent = _indent(m.group("ConditionalDefineIndent")) while conditionalsstack and \ - conditionalsstack[-1] >= thisindent: + conditionalsstack[-1] >= thisindent: del conditionalsstack[-1] if deltastack: del deltastack[-1]