Remove f-strings from DAP

Kévin pointed out that gdb claims a minimum Python version of 3.2, but
the DAP code uses f-strings, which were added in 3.6.

This patch removes the uses of f-strings from the DAP code.  I can't
test an older version of Python, but I did confirm that this still
works with the version I have.
This commit is contained in:
Tom Tromey
2023-06-02 09:43:01 -06:00
parent d294a0fc26
commit a1ef65231b
4 changed files with 4 additions and 4 deletions

View File

@ -84,7 +84,7 @@ def eval_request(
elif context == "repl": elif context == "repl":
return send_gdb_with_response(lambda: _repl(expression, frameId)) return send_gdb_with_response(lambda: _repl(expression, frameId))
else: else:
raise Exception(f'unknown evaluate context "{context}"') raise Exception('unknown evaluate context "' + context + '"')
@in_gdb_thread @in_gdb_thread

View File

@ -60,7 +60,7 @@ def start_json_writer(stream, queue):
seq = seq + 1 seq = seq + 1
encoded = json.dumps(obj) encoded = json.dumps(obj)
body_bytes = encoded.encode("utf-8") body_bytes = encoded.encode("utf-8")
header = f"Content-Length: {len(body_bytes)}\r\n\r\n" header = "Content-Length: " + str(len(body_bytes)) + "\r\n\r\n"
header_bytes = header.encode("ASCII") header_bytes = header.encode("ASCII")
stream.write(header_bytes) stream.write(header_bytes)
stream.write(body_bytes) stream.write(body_bytes)

View File

@ -59,7 +59,7 @@ def launch(
if program is not None: if program is not None:
global _program global _program
_program = program _program = program
send_gdb(f"file {_program}") send_gdb("file " + _program)
if stopAtBeginningOfMainSubprogram: if stopAtBeginningOfMainSubprogram:
send_gdb(_break_at_main) send_gdb(_break_at_main)
if len(args) > 0 or env is not None: if len(args) > 0 or env is not None:

View File

@ -22,4 +22,4 @@ def set_thread(thread_id):
if thread_id == 0: if thread_id == 0:
log("+++ Thread == 0 +++") log("+++ Thread == 0 +++")
else: else:
exec_and_log(f"thread {thread_id}") exec_and_log("thread " + str(thread_id))