From 57033e73a23b0f0e9587013316f9afb0cac08b2a Mon Sep 17 00:00:00 2001 From: Sean Davis <34105785+daviss92@users.noreply.github.com> Date: Thu, 26 Apr 2018 09:56:35 -0400 Subject: [PATCH 1/3] Update core.py --- duplicate/core.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/duplicate/core.py b/duplicate/core.py index 464bba2..af8689f 100644 --- a/duplicate/core.py +++ b/duplicate/core.py @@ -33,7 +33,7 @@ def _iterdups(dupinfo): - for key, value in dupinfo.dups.items(): + for key, value in list(dupinfo.dups.items()): if isinstance(value, DupInfo): for subobj, subkey, subvalue in _iterdups(value): yield subobj, subkey, subvalue From 906d3fea8cd357e28a0721696d9c1dc730ffbe24 Mon Sep 17 00:00:00 2001 From: Sean Davis <34105785+daviss92@users.noreply.github.com> Date: Thu, 26 Apr 2018 09:58:34 -0400 Subject: [PATCH 2/3] Update structs.py --- duplicate/structs.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/duplicate/structs.py b/duplicate/structs.py index 1b0077f..79987c8 100644 --- a/duplicate/structs.py +++ b/duplicate/structs.py @@ -102,14 +102,14 @@ def __new__(cls, filtertype, dups, errors, parentobj=None, parentkey=None): return inst def __init__(self, *args, **kwargs): - super(DupInfo, self).__init__(*args, **kwargs) + super(DupInfo, self).__init__() self._filter() def _filter(self, delkey=None): dupdict = self.dups if delkey is None: - for key, value in dupdict.items(): + for key, value in list(dupdict.items()): if len(value) > 1: continue dupdict.pop(key) From 67f5ec8a092d5f50fb257068ade0f74237e78114 Mon Sep 17 00:00:00 2001 From: Sean Davis <34105785+daviss92@users.noreply.github.com> Date: Thu, 26 Apr 2018 10:01:10 -0400 Subject: [PATCH 3/3] Update common.py --- duplicate/utils/fs/common.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/duplicate/utils/fs/common.py b/duplicate/utils/fs/common.py index f06e601..7eed81b 100644 --- a/duplicate/utils/fs/common.py +++ b/duplicate/utils/fs/common.py @@ -118,7 +118,7 @@ def _scandir(path, onerror, followlinks): if entry.is_file(follow_symlinks=False): files.append(entry) - elif entry.is_dir(followlinks): + elif entry.is_dir(): dirs.append(entry) elif entry.is_file():