# HG changeset patch # User Franz Glasner # Date 1737809913 -3600 # Node ID ca9d5a0dc9bb6c73ebef218176c4d2e4c67f0f29 # Parent 8db78850d800d18f9dcec97c33b3fb8cc6456ab7 Rename WalkDirEntry.sort_key and WalkDirEntry.alt_sort_key diff -r 8db78850d800 -r ca9d5a0dc9bb cutils/treesum.py --- a/cutils/treesum.py Sat Jan 25 13:50:21 2025 +0100 +++ b/cutils/treesum.py Sat Jan 25 13:58:33 2025 +0100 @@ -598,9 +598,9 @@ with walk.ScanDir(path) as dirscan: fsobjects = list(dirscan) if self._utf8_mode: - fsobjects.sort(key=walk.WalkDirEntry.alt_sort_key) + fsobjects.sort(key=walk.WalkDirEntry.sort_key_u8) else: - fsobjects.sort(key=walk.WalkDirEntry.sort_key) + fsobjects.sort(key=walk.WalkDirEntry.sort_key_fs) dir_dgst = self._algorithm[0]() dir_size = 0 dir_tainted = False diff -r 8db78850d800 -r ca9d5a0dc9bb cutils/util/walk.py --- a/cutils/util/walk.py Sat Jan 25 13:50:21 2025 +0100 +++ b/cutils/util/walk.py Sat Jan 25 13:58:33 2025 +0100 @@ -295,11 +295,11 @@ return w @staticmethod - def sort_key(entry): + def sort_key_fs(entry): return entry.alt_fsname # because it should never throw @staticmethod - def alt_sort_key(entry): + def sort_key_u8(entry): return entry.alt_u8name # because it should never throw if PY2: