In Python 2, dict.keys() and dict.values() both return a list, which can
be sorted in two ways:
* l.sort() modifies the list in-place;
* sorted(l) returns a new, sorted list;
In Python 3, dict.keys() and dict.values() do not return lists any more,
but iterators. Iterators do not have a .sort() method.
This commit moves the build scripts to using sorted() on dict keys and
values, which makes them compatible with both Python 2 and Python 3.
Signed-off-by: Mathieu Bridon <bochecha@daitauha.fr>
Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
const char *name;
_glapi_proc proc;
} proc_pairs[%d] = {""" % len(procs))
const char *name;
_glapi_proc proc;
} proc_pairs[%d] = {""" % len(procs))
- names = procs.keys()
- names.sort()
+ names = sorted(procs.keys())
for i in xrange(len(names)):
comma = ',' if i < len(names) - 1 else ''
print(' { "%s", (_glapi_proc) gl%s }%s' % (names[i], procs[names[i]], comma))
for i in xrange(len(names)):
comma = ',' if i < len(names) - 1 else ''
print(' { "%s", (_glapi_proc) gl%s }%s' % (names[i], procs[names[i]], comma))
for enum_obj in self.enums[e]:
list[ enum_obj.priority() ] = enum_obj.name
for enum_obj in self.enums[e]:
list[ enum_obj.priority() ] = enum_obj.name
- keys = list.keys()
- keys.sort()
+ keys = sorted(list.keys())
for k in keys:
j = list[k]
if first:
for k in keys:
j = list[k]
if first:
o = f.offset_of( param_name )
foo[o] = param_name
o = f.offset_of( param_name )
foo[o] = param_name
- keys = foo.keys()
- keys.sort()
+ keys = sorted(foo.keys())
for o in keys:
p = f.parameters_by_name[ foo[o] ]
for o in keys:
p = f.parameters_by_name[ foo[o] ]
functions = []
for func_cat_type in range(0,4):
functions = []
for func_cat_type in range(0,4):
- keys = lists[func_cat_type].keys()
- keys.sort()
+ keys = sorted(lists[func_cat_type].keys())
- names = lists[func_cat_type][key].keys()
- names.sort()
+ names = sorted(lists[func_cat_type][key].keys())
for name in names:
functions.append(lists[func_cat_type][key][name])
for name in names:
functions.append(lists[func_cat_type][key][name])
def enumIterateByName(self):
def enumIterateByName(self):
- keys = self.enums_by_name.keys()
- keys.sort()
+ keys = sorted(self.enums_by_name.keys())
list = []
for enum in keys:
list = []
for enum in keys:
list = []
for cat_type in range(0,4):
list = []
for cat_type in range(0,4):
- keys = self.categories[cat_type].keys()
- keys.sort()
+ keys = sorted(self.categories[cat_type].keys())
for key in keys:
list.append(self.categories[cat_type][key])
for key in keys:
list.append(self.categories[cat_type][key])
print('')
print('/* OpenGL ES specific prototypes */')
print('')
print('')
print('/* OpenGL ES specific prototypes */')
print('')
- keys = categories.keys()
- keys.sort()
+ keys = sorted(categories.keys())
for key in keys:
print('/* category %s */' % key)
print("\n".join(categories[key]))
for key in keys:
print('/* category %s */' % key)
print("\n".join(categories[key]))