diff --git a/modules/nova/module.py b/modules/nova/module.py index 624fe8209c7fa36a524ab080879ace6185cc75c9..0d7a5ccaf327227342c35922890154fdb84300d8 100644 --- a/modules/nova/module.py +++ b/modules/nova/module.py @@ -51,7 +51,7 @@ def iter_resources(self, objs, split_path): if Radio in objs: self._restrict_level(split_path) - for id in self._RADIOS.iterkeys(): + for id in self._RADIOS: yield self.get_radio(id) def iter_radios_search(self, pattern): diff --git a/modules/ouifm/module.py b/modules/ouifm/module.py index bbdfd970a422da13c50ce7e74a15256f82aedda1..84323621d324cc591d35838bfd30547df7bf658c 100644 --- a/modules/ouifm/module.py +++ b/modules/ouifm/module.py @@ -62,7 +62,7 @@ def iter_resources(self, objs, split_path): if Radio in objs: self._restrict_level(split_path) - for id in self._RADIOS.iterkeys(): + for id in self._RADIOS: yield self.get_radio(id) def iter_radios_search(self, pattern): diff --git a/modules/virginradio/module.py b/modules/virginradio/module.py index 5615f77ee1b37e03b1ee49da3ee160aa99fa3671..21e451ce8b7fa9cb9b7f47df8bcef9d29665d8d1 100644 --- a/modules/virginradio/module.py +++ b/modules/virginradio/module.py @@ -119,7 +119,7 @@ def iter_resources(self, objs, split_path): if Radio in objs: self._restrict_level(split_path) - for id in self._RADIOS.iterkeys(): + for id in self._RADIOS: yield self.get_radio(id) def iter_radios_search(self, pattern): diff --git a/weboob/applications/qflatboob/main_window.py b/weboob/applications/qflatboob/main_window.py index 8f1e0e37f1d57161de077dbcdd46bc9bdf7b12ee..974962030eb24501a89d6af3357c48fc26ef8e0e 100644 --- a/weboob/applications/qflatboob/main_window.py +++ b/weboob/applications/qflatboob/main_window.py @@ -118,7 +118,7 @@ def backendsConfig(self): def reloadQueriesList(self, select_name=None): self.ui.queriesList.currentIndexChanged.disconnect(self.queryChanged) self.ui.queriesList.clear() - for name in self.config.get('queries', default={}).iterkeys(): + for name in self.config.get('queries', default={}): self.ui.queriesList.addItem(name) if name == select_name: self.ui.queriesList.setCurrentIndex(len(self.ui.queriesList)-1) diff --git a/weboob/applications/webcontentedit/webcontentedit.py b/weboob/applications/webcontentedit/webcontentedit.py index d647764c962c8c7d453fc497a6691d73ac252fa6..78b04ce59882adb00004aac4d1f595e862a030af 100644 --- a/weboob/applications/webcontentedit/webcontentedit.py +++ b/weboob/applications/webcontentedit/webcontentedit.py @@ -78,7 +78,7 @@ def do_edit(self, line): # check cases where /usr/bin/vi is a symlink to vim if 'vim' in (os.path.basename(editor), os.path.basename(os.path.realpath(find_executable(editor) or '/')).replace('.nox', '')): params = '-p' - os.system("%s %s %s" % (editor, params, ' '.join(['"%s"' % path.replace('"', '\\"') for path in paths.iterkeys()]))) + os.system("%s %s %s" % (editor, params, ' '.join('"%s"' % path.replace('"', '\\"') for path in paths))) for path, content in paths.iteritems(): with open(path, 'r') as f: diff --git a/weboob/core/modules.py b/weboob/core/modules.py index 4ce98bf0a7aa3ecb14556c21c805fdf3eccb7dae..cab86fb313fff62c2cfb95ed509cda1b3d13055f 100644 --- a/weboob/core/modules.py +++ b/weboob/core/modules.py @@ -175,7 +175,7 @@ def __init__(self, repositories): self.repositories = repositories def iter_existing_module_names(self): - for name in self.repositories.get_all_modules_info().iterkeys(): + for name in self.repositories.get_all_modules_info(): yield name def get_module_path(self, module_name): diff --git a/weboob/tools/application/console.py b/weboob/tools/application/console.py index 484d75d9bfdf68848fc7700e2bc2d5b3eef267b5..77484dccc445ae7a54f10065c1db21e817c058c7 100644 --- a/weboob/tools/application/console.py +++ b/weboob/tools/application/console.py @@ -463,15 +463,15 @@ def ask(self, question, default=None, masked=None, regexp=None, choices=None, ti elif v.choices: if v.tiny is None: v.tiny = True - for key in v.choices.iterkeys(): + for key in v.choices: if len(key) > 5 or ' ' in key: v.tiny = False break if v.tiny: question = u'%s (%s)' % (question, '/'.join((s.upper() if s == v.default else s) - for s in v.choices.iterkeys())) - for s in v.choices.iterkeys(): + for s in v.choices)) + for s in v.choices: if s == v.default: aliases[s.upper()] = s for key, value in v.choices.iteritems(): diff --git a/weboob/tools/application/formatters/iformatter.py b/weboob/tools/application/formatters/iformatter.py index d82c480bcccf4733e1105a271db8654264406312..658ee28581d7a9a2b8c9838f9dd2784d979978d3 100644 --- a/weboob/tools/application/formatters/iformatter.py +++ b/weboob/tools/application/formatters/iformatter.py @@ -194,7 +194,7 @@ def format(self, obj, selected_fields=None, alias=None): obj.pop(name) if self.MANDATORY_FIELDS: - missing_fields = set(self.MANDATORY_FIELDS) - set(obj.iterkeys()) + missing_fields = set(self.MANDATORY_FIELDS) - set(obj) if missing_fields: raise MandatoryFieldsNotFound(missing_fields) diff --git a/weboob/tools/application/formatters/load.py b/weboob/tools/application/formatters/load.py index 8cb456043c17cc8bc2735b8756fdc7426e8d9020..c39aa5b7ba8c3d113ea7291aa222329970cfd210 100644 --- a/weboob/tools/application/formatters/load.py +++ b/weboob/tools/application/formatters/load.py @@ -35,7 +35,7 @@ def register_formatter(self, name, klass): self.formatters[name] = klass def get_available_formatters(self): - l = set(self.formatters.iterkeys()) + l = set(self.formatters) l = l.union(self.BUILTINS) l = sorted(l) return l diff --git a/weboob/tools/application/repl.py b/weboob/tools/application/repl.py index ed864dfad60cd3f648ca2340dd03524187014ad3..1b8a92a1ba7188127c0e6fc007704e38eb27b699 100644 --- a/weboob/tools/application/repl.py +++ b/weboob/tools/application/repl.py @@ -796,7 +796,7 @@ def do_logging(self, line): level = levels[args[0]] except KeyError: print('Level "%s" does not exist.' % args[0], file=self.stderr) - print('Availables: %s' % ' '.join(levels.iterkeys()), file=self.stderr) + print('Availables: %s' % ' '.join(levels), file=self.stderr) return 2 else: logging.root.setLevel(level) diff --git a/weboob/tools/json.py b/weboob/tools/json.py index 362cd65c42892567fefb13383cb2ec1b4009dc3b..43e1d5601c87fa12b9ae7433fb0968e140eab88e 100644 --- a/weboob/tools/json.py +++ b/weboob/tools/json.py @@ -52,7 +52,7 @@ def mini_jsonpath(node, path): """ def iterkeys(i): - return range(len(i)) if type(i) is list else i.iterkeys() + return range(len(i)) if type(i) is list else i def cut(s): p = s.split('.', 1) if s else [None]