From 5b3f37c3603cd7459de5f9768eea6b6a64671aa1 Mon Sep 17 00:00:00 2001 From: "M. Ian Graham" Date: Thu, 19 Oct 2006 18:30:29 +0000 Subject: [PATCH] Report output order is now deterministic within the same container size --- direct/src/showbase/ContainerReport.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/direct/src/showbase/ContainerReport.py b/direct/src/showbase/ContainerReport.py index 5c928e7265..c04e05408c 100755 --- a/direct/src/showbase/ContainerReport.py +++ b/direct/src/showbase/ContainerReport.py @@ -156,6 +156,7 @@ class ContainerReport: count = 0 stop = False for l in lengths: + len2ids[l].sort() for id in len2ids[l]: obj = self._id2container[id] print '%s: %s' % (l, self._id2pathStr[id]) @@ -168,7 +169,8 @@ class ContainerReport: initialTypes = (types.DictType, types.ListType, types.TupleType) for type in initialTypes: self._outputType(type, **kArgs) - otherTypes = set(self._type2id2len.keys()).difference(set(initialTypes)) + otherTypes = list(set(self._type2id2len.keys()).difference(set(initialTypes))) + otherTypes.sort() for type in otherTypes: self._outputType(type, **kArgs)