--- a/src/eric7/DataViews/CodeMetrics.py Wed Nov 09 11:32:13 2022 +0100 +++ b/src/eric7/DataViews/CodeMetrics.py Wed Nov 09 15:05:06 2022 +0100 @@ -21,6 +21,8 @@ import token import tokenize +from dataclasses import dataclass + from eric7 import Utilities KEYWORD = token.NT_OFFSET + 1 @@ -31,18 +33,17 @@ EMPTY = tokenize.NL +@dataclass class Token: """ - Class to store the token related infos. + Class to store the token related info. """ - def __init__(self, **kw): - """ - Constructor - - @keyparam **kw list of key, value pairs - """ - self.__dict__.update(kw) + type: int + text: str + row: int + col: int + line: str class Parser: @@ -157,11 +158,11 @@ @param identifier the identifier to be remembered (string) @param row the row, the identifier is defined in (int) """ - if len(self.active) > 1 and self.indent_level > self.active[-1][1]: - # __IGNORE_WARNING_Y108__ - qualified = self.active[-1][0] + "." + identifier - else: - qualified = identifier + qualified = ( + self.active[-1][0] + "." + identifier + if len(self.active) > 1 and self.indent_level > self.active[-1][1] + else identifier + ) self.active.append((qualified, self.indent_level, row)) self.identifiers.append(qualified)