From 7413376922082a34e935d1f8dd1b7ae78be5d78a Mon Sep 17 00:00:00 2001 From: Laurent Bachelier Date: Wed, 10 Apr 2019 11:38:14 +0200 Subject: [PATCH] config: Force everything to be an iterator So this is Python 3 behavior in Python 2 but no change for Python 3. This class is not really useful if you're asking .items() expecting a list like Python 2 does. As a bonus it doesn't make pyflakes.sh panic. --- weboob/tools/config/sqliteconfig.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/weboob/tools/config/sqliteconfig.py b/weboob/tools/config/sqliteconfig.py index fa35e45011..79c122ea7c 100644 --- a/weboob/tools/config/sqliteconfig.py +++ b/weboob/tools/config/sqliteconfig.py @@ -24,7 +24,6 @@ from collections import Mapping, MutableMapping import yaml -from six import PY2 from weboob.tools.compat import unicode @@ -76,14 +75,8 @@ def __iter__(self): for key in self.config.keys(self.base): yield key - def iteritems(self): - return self.config.items(self.base) - def items(self): - if PY2: - return list(self.iteritems()) - else: - return self.iteritems() + return self.config.items(self.base) def __len__(self): return self.config.count(self.base) -- GitLab