diff --git a/share/qtcreator/debugger/cdbbridge.py b/share/qtcreator/debugger/cdbbridge.py index ad63a19b388..ec55b183124 100644 --- a/share/qtcreator/debugger/cdbbridge.py +++ b/share/qtcreator/debugger/cdbbridge.py @@ -353,7 +353,7 @@ class Dumper(DumperBase): def putVTableChildren(self, item, itemCount): p = item.address() - for i in xrange(itemCount): + for i in range(itemCount): deref = self.extractPointer(p) if deref == 0: n = i diff --git a/share/qtcreator/debugger/dumper.py b/share/qtcreator/debugger/dumper.py index 6b0416c563d..b292b145df3 100644 --- a/share/qtcreator/debugger/dumper.py +++ b/share/qtcreator/debugger/dumper.py @@ -48,7 +48,6 @@ except ModuleNotFoundError: if sys.version_info[0] >= 3: - xrange = range toInteger = int else: toInteger = long @@ -306,8 +305,8 @@ class DumperBase: def childRange(self): if self.currentMaxNumChild is None: - return xrange(0, self.currentNumChild) - return xrange(min(self.currentMaxNumChild, self.currentNumChild)) + return range(0, self.currentNumChild) + return range(min(self.currentMaxNumChild, self.currentNumChild)) def enterSubItem(self, item): if self.useTimeStamps: @@ -820,7 +819,7 @@ class DumperBase: def putVTableChildren(self, item, itemCount): p = item.pointer() - for i in xrange(itemCount): + for i in range(itemCount): deref = self.extractPointer(p) if deref == 0: itemCount = i @@ -901,7 +900,7 @@ class DumperBase: self.warn('REDUCING READING MAXIMUM TO %s' % maximum) #DumperBase.warn('BASE: 0x%x TSIZE: %s MAX: %s' % (base, tsize, maximum)) - for i in xrange(0, maximum, tsize): + for i in range(0, maximum, tsize): t = struct.unpack_from(code, blob, i)[0] if t == 0: return 0, i, self.hexencode(blob[:i]) @@ -2090,7 +2089,7 @@ class DumperBase: base = self.extractPointer(connections) data, size, alloc = self.vectorDataHelper(base) connectionType = self.createType('@QObjectPrivate::Connection') - for i in xrange(size): + for i in range(size): first = self.extractPointer(data + i * 2 * ptrSize) while first: self.putSubItem('%s' % pp, @@ -2193,7 +2192,7 @@ class DumperBase: if self.currentIName in self.expandedINames: p = value with Children(self, n): - for i in xrange(n): + for i in range(n): self.putSubItem(i, p.dereference()) p += 1 @@ -2340,7 +2339,7 @@ class DumperBase: self.putField('exp', exp) self.putItemCount(n) self.putNoType() - for i in xrange(n): + for i in range(n): self.handleWatch(exps[i], exps[i], '%s.%d' % (iname, i)) return diff --git a/share/qtcreator/debugger/gdbbridge.py b/share/qtcreator/debugger/gdbbridge.py index c50ba14281c..55ad02afcd5 100644 --- a/share/qtcreator/debugger/gdbbridge.py +++ b/share/qtcreator/debugger/gdbbridge.py @@ -101,7 +101,7 @@ PPPCommand() def scanStack(p, n): p = int(p) r = [] - for i in xrange(n): + for i in range(n): f = gdb.parse_and_eval('{void*}%s' % p) m = gdb.execute('info symbol %s' % f, to_string=True) if not m.startswith('No symbol matches'): diff --git a/share/qtcreator/debugger/lldbbridge.py b/share/qtcreator/debugger/lldbbridge.py index 3617d398a6a..5e049aeb246 100644 --- a/share/qtcreator/debugger/lldbbridge.py +++ b/share/qtcreator/debugger/lldbbridge.py @@ -810,7 +810,7 @@ class Dumper(DumperBase): needle = self.canonicalTypeName(name) #DumperBase.warn('NEEDLE: %s ' % needle) self.warn('Searching for type %s across all target modules, this could be very slow' % name) - for i in xrange(self.target.GetNumModules()): + for i in range(self.target.GetNumModules()): module = self.target.GetModuleAtIndex(i) # SBModule.GetType is new somewhere after early 300.x # So this may fail. @@ -1000,7 +1000,7 @@ class Dumper(DumperBase): return None if thread is None else thread.GetSelectedFrame() def firstStoppedThread(self): - for i in xrange(0, self.process.GetNumThreads()): + for i in range(0, self.process.GetNumThreads()): thread = self.process.GetThreadAtIndex(i) reason = thread.GetStopReason() if (reason == lldb.eStopReasonBreakpoint or @@ -1013,7 +1013,7 @@ class Dumper(DumperBase): def fetchThreads(self, args): result = 'threads=[' - for i in xrange(0, self.process.GetNumThreads()): + for i in range(0, self.process.GetNumThreads()): thread = self.process.GetThreadAtIndex(i) if thread.is_stopped: state = 'stopped' @@ -1043,7 +1043,7 @@ class Dumper(DumperBase): self.reportResult(result, args) def firstUsableFrame(self, thread): - for i in xrange(10): + for i in range(10): frame = thread.GetFrameAtIndex(i) lineEntry = frame.GetLineEntry() line = lineEntry.GetLine() @@ -1067,7 +1067,7 @@ class Dumper(DumperBase): self.currentCallContext = None result = 'stack={current-thread="%s"' % thread.GetThreadID() result += ',frames=[' - for i in xrange(n): + for i in range(n): frame = thread.GetFrameAtIndex(i) if not frame.IsValid(): isLimited = False @@ -1183,7 +1183,7 @@ class Dumper(DumperBase): with Children(self): statics = frame.GetVariables(False, False, True, False) if len(statics): - for i in xrange(len(statics)): + for i in range(len(statics)): staticVar = statics[i] staticVar.SetPreferSyntheticValue(False) typename = staticVar.GetType().GetName() @@ -1408,7 +1408,7 @@ class Dumper(DumperBase): if bp.IsValid() and isinstance(bp, lldb.SBBreakpoint): result += ',locations=[' lineEntry = None - for i in xrange(bp.GetNumLocations()): + for i in range(bp.GetNumLocations()): loc = bp.GetLocationAtIndex(i) addr = loc.GetAddress() lineEntry = addr.GetLineEntry() @@ -1539,7 +1539,7 @@ class Dumper(DumperBase): def fetchModules(self, args): result = 'modules=[' - for i in xrange(self.target.GetNumModules()): + for i in range(self.target.GetNumModules()): module = self.target.GetModuleAtIndex(i) result += '{file="%s"' % module.file.fullpath result += ',name="%s"' % module.file.basename @@ -1559,7 +1559,7 @@ class Dumper(DumperBase): moduleName = args['module'] #file = lldb.SBFileSpec(moduleName) #module = self.target.FindModule(file) - for i in xrange(self.target.GetNumModules()): + for i in range(self.target.GetNumModules()): module = self.target.GetModuleAtIndex(i) if module.file.fullpath == moduleName: break @@ -1872,7 +1872,7 @@ class Tester(Dumper): break if state == lldb.eStateStopped: # 5 stoppedThread = None - for i in xrange(0, self.process.GetNumThreads()): + for i in range(0, self.process.GetNumThreads()): thread = self.process.GetThreadAtIndex(i) reason = thread.GetStopReason() #DumperBase.warn('THREAD: %s REASON: %s' % (thread, reason)) diff --git a/share/qtcreator/debugger/misctypes.py b/share/qtcreator/debugger/misctypes.py index a1343eb9dc8..9889e5ca97b 100644 --- a/share/qtcreator/debugger/misctypes.py +++ b/share/qtcreator/debugger/misctypes.py @@ -65,7 +65,7 @@ def qdump____m512d(d, value): def qdump____m128i(d, value): data = d.hexencode(value.data(16)) - d.putValue(':'.join('%04x' % int(data[i:i+4], 16) for i in xrange(0, 32, 4))) + d.putValue(':'.join('%04x' % int(data[i:i+4], 16) for i in range(0, 32, 4))) if d.isExpanded(): with Children(d): addr = value.address() @@ -76,7 +76,7 @@ def qdump____m128i(d, value): def qdump____m256i(d, value): data = d.hexencode(value.data(32)) - d.putValue(':'.join('%04x' % int(data[i:i+4], 16) for i in xrange(0, 64, 4))) + d.putValue(':'.join('%04x' % int(data[i:i+4], 16) for i in range(0, 64, 4))) if d.isExpanded(): with Children(d): addr = value.address() @@ -87,8 +87,8 @@ def qdump____m256i(d, value): def qdump____m512i(d, value): data = d.hexencode(value.data(64)) - d.putValue(':'.join('%04x' % int(data[i:i+4], 16) for i in xrange(0, 64, 4)) - + ', ' + ':'.join('%04x' % int(data[i:i+4], 16) for i in xrange(64, 128, 4))) + d.putValue(':'.join('%04x' % int(data[i:i+4], 16) for i in range(0, 64, 4)) + + ', ' + ':'.join('%04x' % int(data[i:i+4], 16) for i in range(64, 128, 4))) if d.isExpanded(): with Children(d): d.putArrayItem('uint32x16', value.address(), 16, 'unsigned int') @@ -279,14 +279,14 @@ if False: d.putNoType() if d.isExpanded(): with Children(d): - for i in xrange(count): + for i in range(count): d.putSubItem(Item(entries[i], iname)) with SubItem(d, 'data'): d.putEmptyValue() d.putNoType() if d.isExpanded(): with Children(d): - for i in xrange(count): + for i in range(count): with SubItem(d, i): entry = entries[i] mpitype = str(entry['type']) diff --git a/share/qtcreator/debugger/qttypes.py b/share/qtcreator/debugger/qttypes.py index 705a0051c22..34d592ede7a 100644 --- a/share/qtcreator/debugger/qttypes.py +++ b/share/qtcreator/debugger/qttypes.py @@ -126,8 +126,8 @@ def qdump_X_QAbstractItemModel(d, value): if d.isExpanded(): with Children(d, numChild=rowCount * columnCount, childType=ri.type): i = 0 - for row in xrange(rowCount): - for column in xrange(columnCount): + for row in range(rowCount): + for column in range(columnCount): with SubItem(d, i): d.putName('[%s, %s]' % (row, column)) mi = d.parseAndEvaluate('%s.index(%d,%d,%s)' @@ -182,8 +182,8 @@ def qdump_X_QModelIndex(d, value): with Children(d): d.putFields(value, False) i = 0 - for row in xrange(rowCount): - for column in xrange(columnCount): + for row in range(rowCount): + for column in range(columnCount): with UnnamedSubItem(d, i): d.putName('[%s, %s]' % (row, column)) mi2 = d.parseAndEvaluate('%s.index(%d,%d,%s)' @@ -912,7 +912,7 @@ def qdump__QHostAddress(d, value): if protocol == 1: # value.d.d->a6 data = d.hexencode(a6) - address = ':'.join('%x' % int(data[i:i+4], 16) for i in xrange(0, 32, 4)) + address = ':'.join('%x' % int(data[i:i+4], 16) for i in range(0, 32, 4)) d.putValue(address) elif protocol == 0: # value.d.d->a @@ -938,7 +938,7 @@ def qdump__QHostAddress(d, value): def qdump__QIPv6Address(d, value): raw = d.split('16s', value)[0] data = d.hexencode(raw) - d.putValue(':'.join('%x' % int(data[i:i+4], 16) for i in xrange(0, 32, 4))) + d.putValue(':'.join('%x' % int(data[i:i+4], 16) for i in range(0, 32, 4))) d.putArrayData(value.address(), 16, d.lookupType('unsigned char')) def qform__QList(): diff --git a/share/qtcreator/debugger/stdtypes.py b/share/qtcreator/debugger/stdtypes.py index 83201e42e83..e9f99fc3f60 100644 --- a/share/qtcreator/debugger/stdtypes.py +++ b/share/qtcreator/debugger/stdtypes.py @@ -1160,7 +1160,7 @@ def qdump____gnu_cxx__hash_set(d, value): bucketFinish = buckets["_M_finish"] p = bucketStart itemCount = 0 - for i in xrange((bucketFinish.pointer() - bucketStart.pointer()) // d.ptrSize()): + for i in range((bucketFinish.pointer() - bucketStart.pointer()) // d.ptrSize()): if p.dereference().pointer(): cur = p.dereference() while cur.pointer():