diff options
| -rw-r--r-- | clang/bindings/python/clang/cindex.py | 6 | ||||
| -rw-r--r-- | clang/utils/ABITest/Enumeration.py | 2 | ||||
| -rw-r--r-- | clang/utils/ABITest/TypeGen.py | 2 | ||||
| -rw-r--r-- | clang/utils/modfuzz.py | 2 |
4 files changed, 5 insertions, 7 deletions
diff --git a/clang/bindings/python/clang/cindex.py b/clang/bindings/python/clang/cindex.py index 939213d302d..72e8fdb8a8b 100644 --- a/clang/bindings/python/clang/cindex.py +++ b/clang/bindings/python/clang/cindex.py @@ -109,8 +109,6 @@ if sys.version_info[0] == 3: return x return x.encode('utf8') - xrange = range - elif sys.version_info[0] == 2: # Python 2 strings are utf8 byte strings, no translation is needed for # C-interop. @@ -556,7 +554,7 @@ class TokenGroup(object): token_group = TokenGroup(tu, tokens_memory, tokens_count) - for i in xrange(0, count): + for i in range(0, count): token = Token() token.int_data = tokens_array[i].int_data token.ptr_data = tokens_array[i].ptr_data @@ -3190,7 +3188,7 @@ class CompileCommand(object): Invariant : the first argument is the compiler executable """ length = conf.lib.clang_CompileCommand_getNumArgs(self.cmd) - for i in xrange(length): + for i in range(length): yield conf.lib.clang_CompileCommand_getArg(self.cmd, i) class CompileCommands(object): diff --git a/clang/utils/ABITest/Enumeration.py b/clang/utils/ABITest/Enumeration.py index 01830a38cdf..29a81b4f13f 100644 --- a/clang/utils/ABITest/Enumeration.py +++ b/clang/utils/ABITest/Enumeration.py @@ -199,7 +199,7 @@ def getNthPairVariableBounds(N, bounds): raise ValueError("Invalid input (out of bounds)") level = 0 - active = range(len(bounds)) + active = list(range(len(bounds))) active.sort(key=lambda i: bounds[i]) prevLevel = 0 for i,index in enumerate(active): diff --git a/clang/utils/ABITest/TypeGen.py b/clang/utils/ABITest/TypeGen.py index 8330340cd3d..f8a4d07e11d 100644 --- a/clang/utils/ABITest/TypeGen.py +++ b/clang/utils/ABITest/TypeGen.py @@ -242,7 +242,7 @@ def combinations(values, k): # combinations, selections of a sequence if k==0: yield [] else: - for i in xrange(len(values)-k+1): + for i in range(len(values)-k+1): for cc in combinations(values[i+1:],k-1): yield [values[i]]+cc diff --git a/clang/utils/modfuzz.py b/clang/utils/modfuzz.py index 885621d14e4..948603338cc 100644 --- a/clang/utils/modfuzz.py +++ b/clang/utils/modfuzz.py @@ -106,7 +106,7 @@ def generate(): try: while True: assert m, 'got a failure with no steps; broken clang binary?' - i = random.choice(range(len(m))) + i = random.choice(list(range(len(m)))) x = m[0:i] + m[i+1:] m2 = CodeModel() for d in x: |