Explorar o código

Merge pull request #3677 from geniusgogo/master

[tools] fixed python 2.x `cmp`
Bernard Xiong %!s(int64=4) %!d(string=hai) anos
pai
achega
12530b72a8
Modificáronse 1 ficheiros con 2 adicións e 2 borrados
  1. 2 2
      tools/building.py

+ 2 - 2
tools/building.py

@@ -28,6 +28,7 @@ import os
 import sys
 import string
 import utils
+import operator
 
 from SCons.Script import *
 from utils import _make_path_relative
@@ -678,13 +679,12 @@ def DefineGroup(name, src, depend, **parameters):
     def PriorityInsertGroup(groups, group):
         length = len(groups)
         for i in range(0, length):
-            if cmp(groups[i]['name'].lower(), group['name'].lower()) > 0:
+            if operator.gt(groups[i]['name'].lower(), group['name'].lower()):
                 groups.insert(i, group)
                 return
         groups.append(group)
 
     # add a new group
-    #Projects.append(group)
     PriorityInsertGroup(Projects, group)
 
     return objs