Address reviews

Author: CuriousLearner

Doc/library/getpass.rst

@@ -55,7 +55,7 @@ The :mod:`!getpass` module provides two functions:
    .. versionchanged:: 3.14
       Added the *echo_char* parameter for keyboard feedback.
 
-   .. versionchanged:: 3.15
+   .. versionchanged:: next
       When using non-empty *echo_char* on Unix, keyboard shortcuts (including cursor
       movement and line editing) are now properly handled using the terminal's
       control character configuration.

Lib/getpass.py

@@ -326,7 +326,6 @@ def _handle_erase_word(self):
 
     def _handle(self, char):
         """Handle a single character input. Returns True if handled."""
-        self.eof_pressed = False
         handler = self._dispatch.get(char)
         if handler:
             handler()
@@ -345,18 +344,15 @@ def readline(self, input):
             elif self.literal_next:
                 self._insert_char(char)
                 self.literal_next = False
-                self.eof_pressed = False
             # Check if it's the LNEXT character
             elif char == self.ctrl['LNEXT']:
                 self.literal_next = True
-                self.eof_pressed = False
             # Check for special control characters
             elif char == self.ctrl['INTR']:
                 raise KeyboardInterrupt
             elif char == self.ctrl['EOF']:
                 if self.eof_pressed:
                     break
-                self.eof_pressed = True
             elif char == '\x00':
                 pass
             elif self._handle(char):
@@ -365,7 +361,8 @@ def readline(self, input):
             else:
                 # Insert as normal character
                 self._insert_char(char)
-                self.eof_pressed = False
+
+            self.eof_pressed = (char == self.ctrl['EOF'])
 
         return ''.join(self.password)
 

Lib/test/test_getpass.py

@@ -127,16 +127,14 @@ def test_ctrl_w_display_preserves_prompt(self):
         output = self.check_raw_input('hello world\x17\n', 'hello ')
         # The final visible state should be "Password: ******"
         # Verify prompt is rewritten during refresh, not overwritten by stars
-        self.assertTrue(output.endswith('Password: ******'),
-                        f'Prompt corrupted in display: {output!r}')
+        self.assertEndsWith(output, 'Password: ******')
 
     def test_ctrl_a_insert_display_preserves_prompt(self):
         # Reproducer from gh-138577: type "abc", Ctrl+A, type "x"
         # Display must show "Password: ****" not "****word: ***"
         output = self.check_raw_input('abc\x01x\n', 'xabc')
         # The final visible state should be "Password: ****"
-        self.assertTrue(output.endswith('Password: ****\x08\x08\x08'),
-                        f'Prompt corrupted in display: {output!r}')
+        self.assertEndsWith(output, 'Password: ****\x08\x08\x08')
 
     def test_lnext_ctrl_v_with_echo_char(self):
         # Ctrl+V (LNEXT) should insert the next character literally
@@ -156,10 +154,8 @@ def test_ctrl_k_kill_forward_with_echo_char(self):
 
     def test_ctrl_c_interrupt_with_echo_char(self):
         # Ctrl+C should raise KeyboardInterrupt
-        mock_input = StringIO('test\x03more')
-        mock_output = StringIO()
         with self.assertRaises(KeyboardInterrupt):
-            getpass._raw_input('Password: ', mock_output, mock_input, '*')
+            self.check_raw_input('test\x03more', '')
 
     def test_ctrl_d_eof_with_echo_char(self):
         # Ctrl+D twice should cause EOF