Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-07 10:14:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

py3: fix incorrect import of c_wchar_p from wintypes

Browse Source
This commit is contained in:
Kovid Goyal 2019-12-04 17:06:12 +05:30
parent d880ea2a9c
commit a982b67af0
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/calibre/utils/terminal.py
View File

@ -118,7 +118,7 @@ class Detect(object):
import msvcrt import msvcrt
self.msvcrt = msvcrt self.msvcrt = msvcrt
self.file_handle = msvcrt.get_osfhandle(self.stream.fileno()) self.file_handle = msvcrt.get_osfhandle(self.stream.fileno())
from ctypes import windll, wintypes, byref, POINTER, WinDLL from ctypes import windll, wintypes, byref, POINTER, WinDLL, c_wchar_p
mode = wintypes.DWORD(0) mode = wintypes.DWORD(0)
f = windll.kernel32.GetConsoleMode f = windll.kernel32.GetConsoleMode
f.argtypes, f.restype = [wintypes.HANDLE, POINTER(wintypes.DWORD)], wintypes.BOOL f.argtypes, f.restype = [wintypes.HANDLE, POINTER(wintypes.DWORD)], wintypes.BOOL
@ -128,7 +128,7 @@ class Detect(object):
self.default_console_text_attributes = WCOLORS['white'] self.default_console_text_attributes = WCOLORS['white']
kernel32 = WinDLL(native_string_type('kernel32'), use_last_error=True) kernel32 = WinDLL(native_string_type('kernel32'), use_last_error=True)
self.write_console = kernel32.WriteConsoleW self.write_console = kernel32.WriteConsoleW
self.write_console.argtypes = [wintypes.HANDLE, wintypes.c_wchar_p, wintypes.DWORD, POINTER(wintypes.DWORD), wintypes.LPVOID] self.write_console.argtypes = [wintypes.HANDLE, c_wchar_p, wintypes.DWORD, POINTER(wintypes.DWORD), wintypes.LPVOID]
self.write_console.restype = wintypes.BOOL self.write_console.restype = wintypes.BOOL
kernel32.GetConsoleScreenBufferInfo.argtypes = [wintypes.HANDLE, ctypes.POINTER(CONSOLE_SCREEN_BUFFER_INFO)] kernel32.GetConsoleScreenBufferInfo.argtypes = [wintypes.HANDLE, ctypes.POINTER(CONSOLE_SCREEN_BUFFER_INFO)]
kernel32.GetConsoleScreenBufferInfo.restype = wintypes.BOOL kernel32.GetConsoleScreenBufferInfo.restype = wintypes.BOOL
@ -431,7 +431,7 @@ def test():
text = [colored(t, fg=t)+'. '+colored(t, fg=t, bold=True)+'.' for t in text = [colored(t, fg=t)+'. '+colored(t, fg=t, bold=True)+'.' for t in
('red', 'yellow', 'green', 'white', 'cyan', 'magenta', 'blue',)] ('red', 'yellow', 'green', 'white', 'cyan', 'magenta', 'blue',)]
s.write('\n'.join(text)) s.write('\n'.join(text))
u = u'\u041c\u0438\u0445\u0430\u0438\u043b fällen' u = '\u041c\u0438\u0445\u0430\u0438\u043b fällen'
print() print()
s.write_unicode_text(u) s.write_unicode_text(u)
print() print()