Fix uses of range / xrange for Python 3

[zturner]

Summary

Hi Todd,

I've been putting most of this stuff in withouty review, but I figure every once in a while I should pass one your way as a sanity check to make sure I'm still on the right path.

Anyway, for this one. xrange() is removed from Python 3, and range() is no longer a function but a "sequence object" which must be converted to a list. In theory I could have used six.moves.xrange, but I decided that the efficiency provided by xrange wasn't important in the code, so I changed it all to use range instead.

[zturner]

test/lang/go/types/TestGoASTContext.py

134

Looks like I missed this one. I'll put this one back to list(range(5)) before comitting.

[tfiala]

I've been putting most of this stuff in withouty review, but I figure every once in a while I should pass one your way as a sanity check to make sure I'm still on the right path.

That's fine. As long as it isn't breaking anything, which so far it seems like hasn't :-)

xrange() is removed from Python 3, and range() is no longer a function but a "sequence object" which must be converted to a list. In theory I could have used six.moves.xrange, but I decided that the efficiency provided by xrange wasn't important in the code, so I changed it all to use range instead.

Looks good!

[tfiala]

test/lang/go/types/TestGoASTContext.py

134

Okay.

test/example/TestSequenceFunctions.py

 
     def setUp(self):
         #traceback.print_stack()
-        self.seq = range(10)
+        self.seq = list(range(10))
 
     def tearDown(self):
         #traceback.print_stack()

         # make sure the shuffled sequence does not lose any elements
         random.shuffle(self.seq)
         self.seq.sort()
-        self.assertEqual(self.seq, range(10))
+        self.assertEqual(self.seq, list(range(10)))
 
     def test_choice(self):
         element = random.choice(self.seq)

test/functionalities/inferior-assert/TestInferiorAssert.py

         self.inferior_asserting()
 
     @expectedFailureWindows("llvm.org/pr21793: need to implement support for detecting assertion / abort on Windows")
-    @expectedFailureAndroid(api_levels=range(16 + 1)) # b.android.com/179836
+    @expectedFailureAndroid(api_levels=list(range(16 + 1))) # b.android.com/179836
     def test_inferior_asserting_register(self):
         """Test that lldb reliably reads registers from the inferior after asserting (command)."""
         self.build()

         lldbutil.run_break_set_by_file_and_line (self, "main.c", line, num_expected_locations=1, loc_exact=True)
 
     def check_stop_reason(self):
-        if matchAndroid(api_levels=range(1, 16+1))(self):
+        if matchAndroid(api_levels=list(range(1, 16+1)))(self):
             # On android until API-16 the abort() call ended in a sigsegv instead of in a sigabrt
             stop_reason = 'stop reason = signal SIGSEGV'
         else:

test/functionalities/inferior-crashing/TestInferiorCrashing.py

 
     @expectedFailureFreeBSD('llvm.org/pr24939')
     @expectedFailureWindows("llvm.org/pr24778")
-    @expectedFailureAndroid(archs=['aarch64'], api_levels=range(21 + 1)) # No eh_frame for sa_restorer
+    @expectedFailureAndroid(archs=['aarch64'], api_levels=list(range(21 + 1))) # No eh_frame for sa_restorer
     def test_inferior_crashing_step_after_break(self):
         """Test that lldb functions correctly after stepping through a crash."""
         self.build()

test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py

 
     @expectedFailureFreeBSD('llvm.org/pr24939')
     @expectedFailureWindows("llvm.org/pr24778")
-    @expectedFailureAndroid(archs=['aarch64'], api_levels=range(21 + 1)) # No eh_frame for sa_restorer
+    @expectedFailureAndroid(archs=['aarch64'], api_levels=list(range(21 + 1))) # No eh_frame for sa_restorer
     def test_recursive_inferior_crashing_step_after_break(self):
         """Test that lldb functions correctly after stepping through a crash."""
         self.build()

test/lang/go/goroutines/TestGoroutines.py

 import lldbutil
 from lldbtest import *
 
+import six.moves
+
 class TestGoASTContext(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)

         # self.dbg.HandleCommand("log enable lldb os")
 
         # Now test that stepping works if the memory thread moves to a different backing thread.
-        for i in xrange(11):
+        for i in six.moves.xrange(11):
             self.thread().StepOver()
             self.assertEqual(lldb.eStopReasonPlanComplete, self.thread().GetStopReason(), self.thread().GetStopDescription(100))
         

test/lang/go/types/TestGoASTContext.py

 import lldbutil
 from lldbtest import *
 
+import six.moves
+
 class TestGoASTContext(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)

 
         v = self.var('theArray')
         self.assertEqual(5, v.GetNumChildren())
-        for i in xrange(5):
+        for i in six.moves.xrange(5):
             self.assertEqual(str(i + 1), v.GetChildAtIndex(i).value)

test/lldbutil.py

     def GetFuncName(i):
         return thread.GetFrameAtIndex(i).GetFunctionName()
 
-    return list(map(GetFuncName, range(thread.GetNumFrames())))
+    return list(map(GetFuncName, list(range(thread.GetNumFrames()))))
 
 
 def get_symbol_names(thread):

     def GetSymbol(i):
         return thread.GetFrameAtIndex(i).GetSymbol().GetName()
 
-    return list(map(GetSymbol, range(thread.GetNumFrames())))
+    return list(map(GetSymbol, list(range(thread.GetNumFrames()))))
 
 
 def get_pc_addresses(thread):

     def GetPCAddress(i):
         return thread.GetFrameAtIndex(i).GetPCAddress()
 
-    return list(map(GetPCAddress, range(thread.GetNumFrames())))
+    return list(map(GetPCAddress, list(range(thread.GetNumFrames()))))
 
 
 def get_filenames(thread):

     def GetFilename(i):
         return thread.GetFrameAtIndex(i).GetLineEntry().GetFileSpec().GetFilename()
 
-    return list(map(GetFilename, range(thread.GetNumFrames())))
+    return list(map(GetFilename, list(range(thread.GetNumFrames()))))
 
 
 def get_line_numbers(thread):

     def GetLineNumber(i):
         return thread.GetFrameAtIndex(i).GetLineEntry().GetLine()
 
-    return list(map(GetLineNumber, range(thread.GetNumFrames())))
+    return list(map(GetLineNumber, list(range(thread.GetNumFrames()))))
 
 
 def get_module_names(thread):

     def GetModuleName(i):
         return thread.GetFrameAtIndex(i).GetModule().GetFileSpec().GetFilename()
 
-    return list(map(GetModuleName, range(thread.GetNumFrames())))
+    return list(map(GetModuleName, list(range(thread.GetNumFrames()))))
 
 
 def get_stack_frames(thread):

     def GetStackFrame(i):
         return thread.GetFrameAtIndex(i)
 
-    return list(map(GetStackFrame, range(thread.GetNumFrames())))
+    return list(map(GetStackFrame, list(range(thread.GetNumFrames()))))
 
 
 def print_stacktrace(thread, string_buffer = False):

test/tools/lldb-server/inferior-crash/TestGdbRemoteAbort.py

 
     @llgs_test
     # std::abort() on <= API 16 raises SIGSEGV - b.android.com/179836
-    @expectedFailureAndroid(api_levels=range(16 + 1))
+    @expectedFailureAndroid(api_levels=list(range(16 + 1)))
     def test_inferior_abort_received_llgs(self):
         self.init_llgs_test()
         self.build()