Skip to content

Commit

Permalink
Change some expressions to f-strings format
Browse files Browse the repository at this point in the history
  • Loading branch information
ichorid committed Jan 1, 2021
1 parent 089fb6a commit df0bb3e
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 18 deletions.
11 changes: 5 additions & 6 deletions src/tribler-core/tribler_core/check_os.py
Original file line number Diff line number Diff line change
Expand Up @@ -244,9 +244,8 @@ def trace_calls(file_handler, frame, event, args, filter_exceptions_only=False):

# Only write if callee or caller is Tribler code
if "tribler" in caller_filename.lower() or "tribler" in func_filename.lower():
trace_line = "[{}] {}:{}, line {} called from {}, line {}\n".format(
time.time(), func_filename, func_name, func_line_no,
caller_filename, caller_line_no)
trace_line = f"[{time.time()}] {func_filename}:{func_name}, " \
f"line {func_line_no} called from {caller_filename}, line {caller_line_no}\n"
file_handler.write(trace_line)
file_handler.flush()

Expand All @@ -273,8 +272,8 @@ def trace_exceptions(file_handler, frame, event, args):
# Only write if exception is originated from Tribler code
if "tribler" in func_filename.lower():
exc_type, exc_value, exc_traceback = args
trace_line = "[{}] Exception: {}, line {} \n{} {} \n{}".format(
time.time(), func_filename, func_line_no,
exc_type.__name__, exc_value, "".join(traceback.format_tb(exc_traceback)))
trace_line = f"[{time.time()}] Exception: {func_filename}, line {func_line_no} " \
f"\n{exc_type.__name__} {exc_value} " \
f"\n{''.join(traceback.format_tb(exc_traceback))}"
file_handler.write(trace_line)
file_handler.flush()
7 changes: 3 additions & 4 deletions src/tribler-core/tribler_core/utilities/instrumentation.py
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,8 @@ def run(self):
if self.debug:
self.printe(f"watchog {name} is OK")
elif (self.event_timestamps[name] + self.event_timeouts[name]) < time():
self.printe("watchog {} *******TRIPPED!******, hasn't been set for {:.4f} secs.".format(
name, time() - self.event_timestamps[name]))
self.printe(f"watchog {name} *******TRIPPED!******, "
f"hasn't been set for {(time() - self.event_timestamps[name]):.4f} secs.")
self.printe("disabling it and printing traces for all threads.:")
events_to_unregister.append(name)
self.print_all_stacks()
Expand Down Expand Up @@ -149,8 +149,7 @@ def print_all_stacks(self):

self.printe("Locals by frame, innermost last:")
while frame:
self.printe("{}:{} {}:".format(frame.f_code.co_filename,
frame.f_lineno, frame.f_code.co_name))
self.printe(f"{frame.f_code.co_filename}:{frame.f_lineno} {frame.f_code.co_name}:")
for key, value in frame.f_locals.items():
value = WatchDog.repr_(value)
if len(value) > 500:
Expand Down
6 changes: 2 additions & 4 deletions src/tribler-gui/tribler_gui/core_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,8 @@ def on_core_finished(self, exit_code, exit_status):
if self.events_manager.connect_timer and self.events_manager.connect_timer.isActive():
self.events_manager.connect_timer.stop()

exception_msg = "The Tribler core has unexpectedly finished with exit code {} and status: {}!".format(
exit_code,
exit_status,
)
exception_msg = f"The Tribler core has unexpectedly finished " \
f"with exit code {exit_code} and status: {exit_status}!"
if self.core_traceback:
exception_msg += "\n\n%s\n(Timestamp: %d, traceback timestamp: %d)" % (
self.core_traceback,
Expand Down
6 changes: 2 additions & 4 deletions src/tribler-gui/tribler_gui/debug_window.py
Original file line number Diff line number Diff line change
Expand Up @@ -732,10 +732,8 @@ def on_memory_dump_button_clicked(self, dump_core):
)

if len(self.export_dir) > 0:
filename = "tribler_mem_dump_{}_{}.json".format(
'core' if dump_core else 'gui',
datetime.datetime.now().strftime("%Y-%m-%d-%H-%M-%S"),
)
timestamp_str = datetime.datetime.now().strftime('%Y-%m-%d-%H-%M-%S')
filename = f"tribler_mem_dump_{'core' if dump_core else 'gui'}_{timestamp_str}.json"
if dump_core:
self.rest_request = TriblerNetworkRequest(
"debug/memory/dump", lambda data: self.on_memory_dump_data_available(filename, data)
Expand Down

0 comments on commit df0bb3e

Please sign in to comment.