diff options
| author | Mathieu Bridon <[email protected]> | 2018-07-06 12:22:18 +0200 |
|---|---|---|
| committer | Dylan Baker <[email protected]> | 2018-07-24 11:07:04 -0700 |
| commit | 9ebd8372b9d98b1ffa7e80666ee367c59e128af5 (patch) | |
| tree | 13adc1d5c528c6f6a6ce6ca63acbad63ebce3bb1 /src/mapi | |
| parent | 022d2a381d32d24aabe2c54704a5a5e2440a75e9 (diff) | |
python: Use range() instead of xrange()
Python 2 has a range() function which returns a list, and an xrange()
one which returns an iterator.
Python 3 lost the function returning a list, and renamed the function
returning an iterator as range().
As a result, using range() makes the scripts compatible with both Python
versions 2 and 3.
Signed-off-by: Mathieu Bridon <[email protected]>
Reviewed-by: Eric Engestrom <[email protected]>
Reviewed-by: Dylan Baker <[email protected]>
Reviewed-by: Ian Romanick <[email protected]>
Diffstat (limited to 'src/mapi')
| -rw-r--r-- | src/mapi/glapi/gen/glX_proto_send.py | 2 | ||||
| -rw-r--r-- | src/mapi/glapi/gen/gl_gentable.py | 4 | ||||
| -rw-r--r-- | src/mapi/mapi_abi.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/mapi/glapi/gen/glX_proto_send.py b/src/mapi/glapi/gen/glX_proto_send.py index fba2f0cc1e8..a920ecc012f 100644 --- a/src/mapi/glapi/gen/glX_proto_send.py +++ b/src/mapi/glapi/gen/glX_proto_send.py @@ -392,7 +392,7 @@ static const struct proc_pair _glapi_proc proc; } proc_pairs[%d] = {""" % len(procs)) names = sorted(procs.keys()) - for i in xrange(len(names)): + for i in range(len(names)): comma = ',' if i < len(names) - 1 else '' print(' { "%s", (_glapi_proc) gl%s }%s' % (names[i], procs[names[i]], comma)) print("""}; diff --git a/src/mapi/glapi/gen/gl_gentable.py b/src/mapi/glapi/gen/gl_gentable.py index 49206b11671..9d8923cf8db 100644 --- a/src/mapi/glapi/gen/gl_gentable.py +++ b/src/mapi/glapi/gen/gl_gentable.py @@ -216,13 +216,13 @@ class PrintCode(gl_XML.gl_print_base): # Check that the table has no gaps. We expect a function at every offset, # and the code which generates the table relies on this. - for i in xrange(0, func_count): + for i in range(0, func_count): if funcnames[i] is None: raise Exception("Function table has no function at offset %d" % (i)) print("#define GLAPI_TABLE_COUNT %d" % func_count) print("static const char * const _glapi_table_func_names[GLAPI_TABLE_COUNT] = {") - for i in xrange(0, func_count): + for i in range(0, func_count): print(" /* %5d */ \"%s\"," % (i, funcnames[i])) print("};") diff --git a/src/mapi/mapi_abi.py b/src/mapi/mapi_abi.py index 826721479d5..be1d15d9224 100644 --- a/src/mapi/mapi_abi.py +++ b/src/mapi/mapi_abi.py @@ -260,7 +260,7 @@ def abi_sanity_check(entries): all_names = [] last_slot = entries[-1].slot i = 0 - for slot in xrange(last_slot + 1): + for slot in range(last_slot + 1): if entries[i].slot != slot: raise Exception('entries are not ordered by slots') if entries[i].alias: |