diff options
Diffstat (limited to 'module/plugins/hooks')
| -rw-r--r-- | module/plugins/hooks/Checksum.py | 2 | ||||
| -rw-r--r-- | module/plugins/hooks/ExternalScripts.py | 2 | ||||
| -rw-r--r-- | module/plugins/hooks/ExtractArchive.py | 2 | ||||
| -rw-r--r-- | module/plugins/hooks/MegaRapidoNetHook.py | 2 | ||||
| -rw-r--r-- | module/plugins/hooks/MergeFiles.py | 4 | ||||
| -rw-r--r-- | module/plugins/hooks/UpdateManager.py | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/module/plugins/hooks/Checksum.py b/module/plugins/hooks/Checksum.py index 9eb47e8a6..251918df5 100644 --- a/module/plugins/hooks/Checksum.py +++ b/module/plugins/hooks/Checksum.py @@ -166,7 +166,7 @@ class Checksum(Addon): def package_finished(self, pypack): download_folder = fs_join(self.pyload.config.get("general", "download_folder"), pypack.folder, "") - for link in pypack.getChildren().itervalues(): + for link in pypack.getChildren().values(): file_type = os.path.splitext(link['name'])[1][1:].lower() if file_type not in self.formats: diff --git a/module/plugins/hooks/ExternalScripts.py b/module/plugins/hooks/ExternalScripts.py index 126a17635..9c9cd51c6 100644 --- a/module/plugins/hooks/ExternalScripts.py +++ b/module/plugins/hooks/ExternalScripts.py @@ -48,7 +48,7 @@ class ExternalScripts(Addon): for dir in (pypath, ''): self.init_plugin_type(folder, os.path.join(dir, 'scripts', folder)) - for script_type, names in self.scripts.iteritems(): + for script_type, names in self.scripts.items(): if names: self.log_info(_("Installed scripts for: ") + script_type, ", ".join(map(os.path.basename, names))) diff --git a/module/plugins/hooks/ExtractArchive.py b/module/plugins/hooks/ExtractArchive.py index 5a51319ad..2e45f4a38 100644 --- a/module/plugins/hooks/ExtractArchive.py +++ b/module/plugins/hooks/ExtractArchive.py @@ -299,7 +299,7 @@ class ExtractArchive(Addon): matched = False success = True files_ids = dict((pylink['name'], ((fs_join(download_folder, pypack.folder, pylink['name'])), pylink['id'], out)) for pylink \ - in sorted(pypack.getChildren().itervalues(), key=lambda k: k['name'])).values() #: Remove duplicates + in sorted(pypack.getChildren().values(), key=lambda k: k['name'])).values() #: Remove duplicates #: Check as long there are unseen files while files_ids: diff --git a/module/plugins/hooks/MegaRapidoNetHook.py b/module/plugins/hooks/MegaRapidoNetHook.py index f66129a9e..4956427ff 100644 --- a/module/plugins/hooks/MegaRapidoNetHook.py +++ b/module/plugins/hooks/MegaRapidoNetHook.py @@ -76,7 +76,7 @@ class MegaRapidoNetHook(MultiHook): hoster_list = [] - for item in hosters.itervalues(): + for item in hosters.values(): hoster_list.extend(item) return hoster_list diff --git a/module/plugins/hooks/MergeFiles.py b/module/plugins/hooks/MergeFiles.py index 94c477b38..a76a578bf 100644 --- a/module/plugins/hooks/MergeFiles.py +++ b/module/plugins/hooks/MergeFiles.py @@ -30,7 +30,7 @@ class MergeFiles(Addon): def package_finished(self, pack): files = {} fid_dict = {} - for fid, data in pack.getChildren().iteritems(): + for fid, data in pack.getChildren().items(): if re.search("\.\d{3}$", data['name']): if data['name'][:-4] not in files: files[data['name'][:-4]] = [] @@ -43,7 +43,7 @@ class MergeFiles(Addon): if self.pyload.config.get("general", "folder_per_package"): download_folder = fs_join(download_folder, pack.folder) - for name, file_list in files.iteritems(): + for name, file_list in files.items(): self.log_info(_("Starting merging of"), name) with open(fs_join(download_folder, name), "wb") as final_file: diff --git a/module/plugins/hooks/UpdateManager.py b/module/plugins/hooks/UpdateManager.py index 4e13bfe9c..c36b6c539 100644 --- a/module/plugins/hooks/UpdateManager.py +++ b/module/plugins/hooks/UpdateManager.py @@ -114,7 +114,7 @@ class UpdateManager(Addon): modules = filter( lambda m: m and (m.__name__.startswith("module.plugins.") or m.__name__.startswith("userplugins.")) and - m.__name__.count(".") >= 2, sys.modules.itervalues() + m.__name__.count(".") >= 2, sys.modules.values() ) reloads = [] |