Author: serge_sans_paille Date: Tue Dec 18 00:24:06 2018 New Revision: 349448
URL: http://llvm.org/viewvc/llvm-project?rev=349448&view=rev Log: Portable Python script across Python version Replace `xrange(...)` by either `range(...)` or `list(range(...))` depending on the context. Differential Revision: https://reviews.llvm.org/D55193 Modified: cfe/trunk/bindings/python/clang/cindex.py cfe/trunk/utils/ABITest/Enumeration.py cfe/trunk/utils/ABITest/TypeGen.py cfe/trunk/utils/modfuzz.py Modified: cfe/trunk/bindings/python/clang/cindex.py URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/bindings/python/clang/cindex.py?rev=349448&r1=349447&r2=349448&view=diff ============================================================================== --- cfe/trunk/bindings/python/clang/cindex.py (original) +++ cfe/trunk/bindings/python/clang/cindex.py Tue Dec 18 00:24:06 2018 @@ -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): Modified: cfe/trunk/utils/ABITest/Enumeration.py URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/utils/ABITest/Enumeration.py?rev=349448&r1=349447&r2=349448&view=diff ============================================================================== --- cfe/trunk/utils/ABITest/Enumeration.py (original) +++ cfe/trunk/utils/ABITest/Enumeration.py Tue Dec 18 00:24:06 2018 @@ -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): Modified: cfe/trunk/utils/ABITest/TypeGen.py URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/utils/ABITest/TypeGen.py?rev=349448&r1=349447&r2=349448&view=diff ============================================================================== --- cfe/trunk/utils/ABITest/TypeGen.py (original) +++ cfe/trunk/utils/ABITest/TypeGen.py Tue Dec 18 00:24:06 2018 @@ -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 Modified: cfe/trunk/utils/modfuzz.py URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/utils/modfuzz.py?rev=349448&r1=349447&r2=349448&view=diff ============================================================================== --- cfe/trunk/utils/modfuzz.py (original) +++ cfe/trunk/utils/modfuzz.py Tue Dec 18 00:24:06 2018 @@ -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: _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
