Fixes for Python 3

rdb · rdb · commit 79430f6bc584 · 2014-02-27T11:30:56.000Z
diff --git a/direct/src/actor/Actor.py b/direct/src/actor/Actor.py
@@ -566,27 +566,24 @@ def __updateSortedLODNames(self):
         # and sort them every time somebody asks for the list
         self.__sortedLODNames = self.__partBundleDict.keys()
         # Reverse sort the doing a string->int
-        def sortFunc(x, y):
+        def sortKey(x):
             if not str(x).isdigit():
                 smap = {'h':3,
                         'm':2,
                         'l':1,
                         'f':0}
 
                 """
-                sx = smap.get(x[0],None)
-                sy = smap.get(y[0],None)
+                sx = smap.get(x[0], None)
 
                 if sx is None:
                     self.notify.error('Invalid lodName: %s' % x)
-                if sy is None:
-                    self.notify.error('Invalid lodName: %s' % y)
                 """
-                return cmp(smap[y[0]], smap[x[0]])
+                return smap[x[0]]
             else:
-                return cmp (int(y), int(x))
+                return int(x)
 
-        self.__sortedLODNames.sort(sortFunc)
+        self.__sortedLODNames.sort(key=sortKey, reverse=True)
 
     def getLODNames(self):
         """
diff --git a/direct/src/interval/FunctionInterval.py b/direct/src/interval/FunctionInterval.py
@@ -57,9 +57,10 @@ def __init__(self, function, **kw):
         self.function = function
             
         # Create a unique name for the interval if necessary
-        if (name == None):
+        if name is None:
             name = self.makeUniqueName(function)
-        assert isinstance(name, types.StringType)
+        assert isinstance(name, str)
+
         # Record any arguments
         self.extraArgs = extraArgs
         self.kw = kw
