Browse code

Fixes #1101 - "files-from" option was resulting in an AttributeError with Python3

Florent Viard authored on 2020/06/01 09:09:05
Showing 2 changed files
... ...
@@ -184,9 +184,7 @@ def _get_filelist_from_file(cfg, local_path):
184 184
 
185 185
     # reformat to match os.walk()
186 186
     result = []
187
-    keys = filelist.keys()
188
-    keys.sort()
189
-    for key in keys:
187
+    for key in sorted(filelist):
190 188
         values = filelist[key]
191 189
         values.sort()
192 190
         result.append((key, [], values))
... ...
@@ -37,7 +37,7 @@ class SortedDict(dict):
37 37
     def keys(self):
38 38
         # TODO fix
39 39
         # Probably not anymore memory efficient on python2
40
-        # as now 2 copies ok keys to sort them.
40
+        # as now 2 copies of keys to sort them.
41 41
         keys = dict.keys(self)
42 42
         if self.ignore_case:
43 43
             # Translation map