Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Lib/profiling/sampling/live_collector/collector.py
Original file line number Diff line number Diff line change
Expand Up @@ -861,10 +861,12 @@ def _handle_input(self):
# Handle help toggle keys
if ch == ord("h") or ch == ord("H") or ch == ord("?"):
self.show_help = not self.show_help
return

# If showing help, any other key closes it
elif self.show_help and ch != -1:
if self.show_help and ch != -1:
self.show_help = False
return

# Handle regular commands
if ch == ord("q") or ch == ord("Q"):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,19 @@ def test_help_with_question_mark(self):

self.assertTrue(self.collector.show_help)

def test_help_dismiss_with_q_does_not_quit(self):
"""Test that pressing 'q' while help is shown only closes help, not quit"""
self.assertFalse(self.collector.show_help)
self.display.simulate_input(ord("h"))
self.collector._handle_input()
self.assertTrue(self.collector.show_help)

self.display.simulate_input(ord("q"))
self.collector._handle_input()

self.assertFalse(self.collector.show_help)
self.assertTrue(self.collector.running)

def test_filter_clear(self):
"""Test clearing filter."""
self.collector.filter_pattern = "test"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix typing ``'q'`` at the help of the interactive tachyon profiler exiting
the profiler.
Loading