MirroredRepos/thefuck
1
0
Fork 0
mirror of https://github.com/nvbn/thefuck.git synced 2025-01-31 02:01:13 +00:00
Code Issues Releases Wiki Activity

Fix Win32 get_key (#819)

Browse Source 
PR #711 moved the arrow and cancel key codes to `const.py`. However, the
move also changed the codes from byte arrays to strings, which broke the
use of `msvcrt.getch()` for Windows.

The fix is to use `msvcrt.getwch()` so the key is a Unicode character,
matching the Unix implementation.
This commit is contained in:
Matt Kotsenas 2018-07-09 15:46:57 -07:00 committed by Vladimir Iakovlev
parent 86efc6a252
commit a6bb41e802
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
thefuck/system/win32.py
View File

@ -1,5 +1,4 @@
import os
import sys
import msvcrt
import win_unicode_console
from .. import const
@ -12,20 +11,18 @@ def init_output():
def get_key():
ch = msvcrt.getch()
if ch in (b'\x00', b'\xe0'): # arrow or function key prefix?
ch = msvcrt.getch() # second call returns the actual key code
ch = msvcrt.getwch()
if ch in ('\x00', '\xe0'): # arrow or function key prefix?
ch = msvcrt.getwch() # second call returns the actual key code
if ch in const.KEY_MAPPING:
return const.KEY_MAPPING[ch]
if ch == b'H':
if ch == 'H':
return const.KEY_UP
if ch == b'P':
if ch == 'P':
return const.KEY_DOWN
encoding = (sys.stdout.encoding
or os.environ.get('PYTHONIOENCODING', 'utf-8'))
return ch.decode(encoding)
return ch
def open_command(arg):