direct: Fix errors in PythonUtil.detectLeaks() function (panda3d#955)

fireclawthefox · rdb · commit 86cfbc22b1ce · 2020-06-15T15:26:17.000+02:00
* Replaced removed choice() function with ternary expression * Add sanity check for _crashOnProactiveLeakDetect, don't crash by default Closes panda3d#955
diff --git a/direct/src/showbase/DirectObject.py b/direct/src/showbase/DirectObject.py
@@ -94,12 +94,12 @@ def detectLeaks(self):
         if hasattr(self, '_taskList'):
             tasks = [task.name for task in self._taskList.values()]
         if len(events) or len(tasks):
-            estr = choice(len(events), 'listening to events: %s' % events, '')
-            andStr = choice(len(events) and len(tasks), ' and ', '')
-            tstr = choice(len(tasks), '%srunning tasks: %s' % (andStr, tasks), '')
+            estr = ('listening to events: %s' % events if len(events) else '')
+            andStr = (' and ' if len(events) and len(tasks) else '')
+            tstr = ('%srunning tasks: %s' % (andStr, tasks) if len(tasks) else '')
             notify = directNotify.newCategory('LeakDetect')
-            func = choice(getRepository()._crashOnProactiveLeakDetect,
-                          self.notify.error, self.notify.warning)
+            crash = getattr(getRepository(), '_crashOnProactiveLeakDetect', False)
+            func = (self.notify.error if crash else self.notify.warning)
             func('destroyed %s instance is still %s%s' % (self.__class__.__name__, estr, tstr))
 
     #snake_case alias:
