Browse Source

PythonUtil: Fix usage of reduce() for Python 3

pythonengineer 5 years ago
parent
commit
13011278af
1 changed files with 3 additions and 2 deletions
  1. 3 2
      direct/src/showbase/PythonUtil.py

+ 3 - 2
direct/src/showbase/PythonUtil.py

@@ -39,6 +39,7 @@ import random
 import time
 import time
 import builtins
 import builtins
 import importlib
 import importlib
+import functools
 
 
 __report_indent = 3
 __report_indent = 3
 
 
@@ -2062,7 +2063,7 @@ def report(types = [], prefix = '', xform = None, notifyFunc = None, dConfigPara
             if not rArgs:
             if not rArgs:
                 rArgs = '()'
                 rArgs = '()'
             else:
             else:
-                rArgs = '(' + reduce(str.__add__,rArgs)[:-2] + ')'
+                rArgs = '(' + functools.reduce(str.__add__,rArgs)[:-2] + ')'
 
 
 
 
             outStr = '%s%s' % (f.__name__, rArgs)
             outStr = '%s%s' % (f.__name__, rArgs)
@@ -2345,7 +2346,7 @@ class MiniLog:
         if not rArgs:
         if not rArgs:
             rArgs = '()'
             rArgs = '()'
         else:
         else:
-            rArgs = '(' + reduce(str.__add__,rArgs)[:-2] + ')'
+            rArgs = '(' + functools.reduce(str.__add__,rArgs)[:-2] + ')'
 
 
         line = '%s%s' % (funcName, rArgs)
         line = '%s%s' % (funcName, rArgs)
         self.appendFunctionCall(line)
         self.appendFunctionCall(line)