summaryrefslogtreecommitdiffstats
path: root/module/plugins/hooks/MergeFiles.py
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2015-07-25 09:42:49 +0200
committerGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2015-07-25 09:42:49 +0200
commit952001324e1faf584b1adcb01c4a0406a3722932 (patch)
treeed87ade69e207e677d1144147b381bcd508ab25d /module/plugins/hooks/MergeFiles.py
parentAccount rewritten (2) (diff)
downloadpyload-952001324e1faf584b1adcb01c4a0406a3722932.tar.xz
Don't user dictionary’s iterator methods
Diffstat (limited to 'module/plugins/hooks/MergeFiles.py')
-rw-r--r--module/plugins/hooks/MergeFiles.py4
1 files changed, 2 insertions, 2 deletions
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: