forked from qt-creator/qt-creator
Debugger: Replace uses of f-strings
F-strings are Python 3.6 feature and we have users with older versions. Task-number: QTCREATORBUG-32475 Change-Id: Ia4e70f64a8d63b399e92902e952330d7267ad60b Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
@@ -81,7 +81,7 @@ def qdump__std____1__set(d, value):
|
||||
alloc_size = alloc_type.size()
|
||||
# see disclaimer #2
|
||||
if alloc_size > 1:
|
||||
(proxy, head, alloc, size) = value.split(f'pp{{{alloc_type.name}}}p')
|
||||
(proxy, head, alloc, size) = value.split('pp{{{}}}p'.format(alloc_type.name))
|
||||
else:
|
||||
(proxy, head, size) = value.split("ppp")
|
||||
|
||||
@@ -122,7 +122,7 @@ def qdump__std____1__map(d, value):
|
||||
alloc_size = alloc_type.size()
|
||||
# see disclaimers #2 and #3
|
||||
if alloc_size > 1:
|
||||
(begin_node_ptr, head, alloc, size) = value.split(f'pp{{{alloc_type.name}}}p')
|
||||
(begin_node_ptr, head, alloc, size) = value.split('pp{{{}}}p'.format(alloc_type.name))
|
||||
else:
|
||||
(begin_node_ptr, head, size) = value.split("ppp")
|
||||
|
||||
@@ -134,7 +134,7 @@ def qdump__std____1__map(d, value):
|
||||
|
||||
def in_order_traversal(node):
|
||||
(left, right, _parent, _is_black, _pad, pair) = d.split(
|
||||
f'pppB@{{{pair_type.name}}}', node)
|
||||
'pppB@{{{}}}'.format(pair_type.name), node)
|
||||
|
||||
if left:
|
||||
for res in in_order_traversal(left):
|
||||
|
@@ -604,7 +604,7 @@ def qdump__tl__expected(d: DumperBase, value: DumperBase.Value):
|
||||
|
||||
# Result and error (and a initialized flag) are packed into a union storage
|
||||
largerType = max(okType, errType, key=lambda t: t.size())
|
||||
storage, has_value = value.split(f'{{{largerType.name}}}b')
|
||||
storage, has_value = value.split('{{{}}}b'.format(largerType.name))
|
||||
val = storage.cast(okType.name) if has_value else storage.cast(errType.name)
|
||||
|
||||
if has_value:
|
||||
|
@@ -918,7 +918,7 @@ def qdump__QFlags(d, value):
|
||||
v = value.cast(enumType.name)
|
||||
size = enumType.size()
|
||||
# One byte is 2 hex digits
|
||||
d.putValue(v.displayEnum(f'0x%0{2 * size}x'))
|
||||
d.putValue(v.displayEnum('0x%0{}x'.format(2 * size)))
|
||||
|
||||
|
||||
def qform__QHash():
|
||||
@@ -1053,7 +1053,7 @@ def qdumpHelper_QMultiHash_6(d, value, key_type, value_type):
|
||||
d.putItemCount(size)
|
||||
|
||||
if d.isExpanded():
|
||||
type_code = f'{{{key_type.name}}}@p'
|
||||
type_code = '{{{}}}@p'.format(key_type.name)
|
||||
_pp, entry_size, _fields = d.describeStruct(type_code)
|
||||
with Children(d, size):
|
||||
span_size = 128 + 2 * d.ptrSize() # Including tail padding.
|
||||
@@ -1069,7 +1069,7 @@ def qdumpHelper_QMultiHash_6(d, value, key_type, value_type):
|
||||
key, _pad, chain = d.split(type_code, entry)
|
||||
next = chain
|
||||
while next != 0:
|
||||
val, _pad, next = d.split(f'{{{value_type.name}}}@p', next)
|
||||
val, _pad, next = d.split('{{{}}}@p'.format(value_type.name), next)
|
||||
d.putPairItem(count, (key, val), 'key', 'value')
|
||||
count += 1
|
||||
|
||||
|
@@ -117,7 +117,7 @@ def qdumpHelper__std__deque__libcxx(d, value):
|
||||
alloc_size = alloc_type.size()
|
||||
# see disclaimer #2
|
||||
if alloc_size > 1:
|
||||
mptr, mfirst, mbegin, mend, alloc, start, size = value.split(f'pppp{{{alloc_type.name}}}tt')
|
||||
mptr, mfirst, mbegin, mend, alloc, start, size = value.split('pppp{{{}}}tt'.format(alloc_type.name))
|
||||
else:
|
||||
mptr, mfirst, mbegin, mend, start, size = value.split("pppptt")
|
||||
d.check(0 <= size and size <= 1000 * 1000 * 1000)
|
||||
@@ -495,12 +495,12 @@ def qdump____gnu_debug___Safe_iterator(d, value):
|
||||
if is_map:
|
||||
key_type = inner_type[0]
|
||||
value_type = inner_type[1]
|
||||
typecode = f'pppp@{{{key_type.name}}}@{{{value_type.name}}}'
|
||||
typecode = 'pppp@{{{}}}@{{{}}}'.format(key_type.name, value_type.name)
|
||||
(color, parent, left, right, pad1, key, pad2, value) = d.split(typecode, node)
|
||||
d.putSubItem("first", key)
|
||||
d.putSubItem("second", value)
|
||||
else:
|
||||
typecode = f'pppp@{{{inner_type.name}}}'
|
||||
typecode = 'pppp@{{{}}}'.format(inner_type.name)
|
||||
(color, parent, left, right, pad1, key) = d.split(typecode, node)
|
||||
d.putSubItem("value", key)
|
||||
with SubItem(d, "[node]"):
|
||||
@@ -1151,7 +1151,7 @@ def qdumpHelper__std__vector__msvc(d, value):
|
||||
if d.isDebugBuild:
|
||||
offset += d.ptrSize() # _MyVal2._Myproxy
|
||||
core = d.createValue(value.address() + offset, value.type)
|
||||
first, last, end = core.split(f'ppp')
|
||||
first, last, end = core.split('ppp')
|
||||
size = (last - first) // inner_type.size()
|
||||
d.check(0 <= size and size <= 1000 * 1000 * 1000)
|
||||
qdumpHelper__std__vector__nonbool(d, first, last, end, inner_type)
|
||||
|
Reference in New Issue
Block a user