From 3eec17929790cadbd33d390cc2360836021178c7 Mon Sep 17 00:00:00 2001 From: Ulf Magnusson Date: Fri, 19 Jun 2015 05:52:10 +0200 Subject: Get rid of _Feed.__len__(). Cleaner to just check for more tokens in the few spots that used it. Seems slightly faster too, though it might be in the noise. --- kconfiglib.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/kconfiglib.py b/kconfiglib.py index 9ca4434..99cb8b0 100644 --- a/kconfiglib.py +++ b/kconfiglib.py @@ -1172,7 +1172,7 @@ class Config(object): elif t0 in (T_BOOL, T_TRISTATE, T_INT, T_HEX, T_STRING): stmt.type = TOKEN_TO_TYPE[t0] - if len(tokens) > 1: + if tokens.peek_next() is not None: new_prompt = parse_val_and_cond(tokens, line, filename, linenr) @@ -1182,7 +1182,7 @@ class Config(object): elif t0 == T_DEF_BOOL: stmt.type = BOOL - if len(tokens) > 1: + if tokens.peek_next() is not None: new_def_exprs.append(parse_val_and_cond(tokens, line, filename, linenr)) @@ -1208,7 +1208,7 @@ class Config(object): elif t0 == T_DEF_TRISTATE: stmt.type = TRISTATE - if len(tokens) > 1: + if tokens.peek_next() is not None: new_def_exprs.append(parse_val_and_cond(tokens, line, filename, linenr)) @@ -3106,9 +3106,6 @@ class _Feed(object): def unget_all(self): self.i = 0 - def __len__(self): - return self.length - class _FileFeed(object): """Feeds lines from a file. Keeps track of the filename and current line -- cgit v1.2.3