| 1 |
The boilerplate for calling this method was larger than what it actually |
| 2 |
contained. Additionally I think this change will allow the loop to run |
| 3 |
on a generator rather than a full list. |
| 4 |
|
| 5 |
Signed-off-by: Matt Turner <mattst88@g.o> |
| 6 |
--- |
| 7 |
pym/gentoolkit/eclean/clean.py | 21 ++++++--------------- |
| 8 |
1 file changed, 6 insertions(+), 15 deletions(-) |
| 9 |
|
| 10 |
diff --git a/pym/gentoolkit/eclean/clean.py b/pym/gentoolkit/eclean/clean.py |
| 11 |
index fd59976..b790de0 100644 |
| 12 |
--- a/pym/gentoolkit/eclean/clean.py |
| 13 |
+++ b/pym/gentoolkit/eclean/clean.py |
| 14 |
@@ -36,10 +36,9 @@ class CleanUp(object): |
| 15 |
@return: total size that was cleaned |
| 16 |
""" |
| 17 |
file_type = 'file' |
| 18 |
- clean_keys = self._sort_keys(clean_dict) |
| 19 |
clean_size = 0 |
| 20 |
- # clean all entries one by one |
| 21 |
- for key in clean_keys: |
| 22 |
+ # clean all entries one by one; sorting helps reading |
| 23 |
+ for key in sorted(clean_dict.keys()): |
| 24 |
clean_size += self._clean_files(clean_dict[key], key, file_type) |
| 25 |
# return total size of deleted or to delete files |
| 26 |
return clean_size |
| 27 |
@@ -57,10 +56,9 @@ class CleanUp(object): |
| 28 |
@return: total size that was cleaned |
| 29 |
""" |
| 30 |
file_type = 'binary package' |
| 31 |
- clean_keys = self._sort_keys(clean_dict) |
| 32 |
clean_size = 0 |
| 33 |
- # clean all entries one by one |
| 34 |
- for key in clean_keys: |
| 35 |
+ # clean all entries one by one; sorting helps reading |
| 36 |
+ for key in sorted(clean_dict.keys()): |
| 37 |
clean_size += self._clean_files(clean_dict[key], key, file_type) |
| 38 |
|
| 39 |
# run 'emaint --fix' here |
| 40 |
@@ -83,10 +81,9 @@ class CleanUp(object): |
| 41 |
@return: total size that would be cleaned |
| 42 |
""" |
| 43 |
file_type = 'file' |
| 44 |
- clean_keys = self._sort_keys(clean_dict) |
| 45 |
clean_size = 0 |
| 46 |
- # tally all entries one by one |
| 47 |
- for key in clean_keys: |
| 48 |
+ # tally all entries one by one; sorting helps reading |
| 49 |
+ for key in sorted(clean_dict.keys()): |
| 50 |
key_size = self._get_size(clean_dict[key]) |
| 51 |
self.controller(key_size, key, clean_dict[key], file_type) |
| 52 |
clean_size += key_size |
| 53 |
@@ -110,12 +107,6 @@ class CleanUp(object): |
| 54 |
print( pp.error("Error: %s" %str(er)), file=sys.stderr) |
| 55 |
return key_size |
| 56 |
|
| 57 |
- def _sort_keys(self, clean_dict): |
| 58 |
- """Returns a list of sorted dictionary keys.""" |
| 59 |
- # sorting helps reading |
| 60 |
- clean_keys = sorted(clean_dict) |
| 61 |
- return clean_keys |
| 62 |
- |
| 63 |
def _clean_files(self, files, key, file_type): |
| 64 |
"""File removal function.""" |
| 65 |
clean_size = 0 |
| 66 |
-- |
| 67 |
2.23.0 |
Archives