From: david-sarah Date: Mon, 26 Jul 2010 04:50:19 +0000 (-0700) Subject: windows/fixups.py: Don't rely on buggy MSVCRT library for Unicode output, use the... X-Git-Tag: allmydata-tahoe-1.8.0b2~56 X-Git-Url: https://git.rkrishnan.org/?a=commitdiff_plain;h=54bbc5325f9dae8baecd3f03682d8864d877af1b;p=tahoe-lafs%2Ftahoe-lafs.git windows/fixups.py: Don't rely on buggy MSVCRT library for Unicode output, use the Win32 API instead. This should make it work on XP. Also, change how we handle the case where sys.stdout and sys.stderr are redirected, since the .encoding attribute isn't necessarily writeable. --- diff --git a/src/allmydata/windows/fixups.py b/src/allmydata/windows/fixups.py index 6a60a664..dcedd174 100644 --- a/src/allmydata/windows/fixups.py +++ b/src/allmydata/windows/fixups.py @@ -8,9 +8,10 @@ def initialize(): return True done = True + original_stderr = sys.stderr import codecs, re - from ctypes import WINFUNCTYPE, windll, CFUNCTYPE, cdll, POINTER, byref, \ - c_wchar_p, c_char_p, c_void_p, c_int, c_size_t + from ctypes import WINFUNCTYPE, windll, POINTER, byref, c_int + from ctypes.wintypes import BOOL, HANDLE, DWORD, LPWSTR, LPCWSTR, LPVOID from allmydata.util import log from allmydata.util.encodingutil import canonical_encoding @@ -19,99 +20,146 @@ def initialize(): # Make Unicode console output work independently of the current code page. # This also fixes . - # Credit to Michael Kaplan + # Credit to Michael Kaplan # and TZOmegaTZIOY # . try: + # + # HANDLE WINAPI GetStdHandle(DWORD nStdHandle); + # returns INVALID_HANDLE_VALUE, NULL, or a valid handle + # + # + # DWORD WINAPI GetFileType(DWORD hFile); + # + # + # BOOL WINAPI GetConsoleMode(HANDLE hConsole, LPDWORD lpMode); + + GetStdHandle = WINFUNCTYPE(HANDLE, DWORD)(("GetStdHandle", windll.kernel32)) + STD_OUTPUT_HANDLE = DWORD(-11) + STD_ERROR_HANDLE = DWORD(-12) + GetFileType = WINFUNCTYPE(DWORD, DWORD)(("GetFileType", windll.kernel32)) + FILE_TYPE_CHAR = 0x0002 + FILE_TYPE_REMOTE = 0x8000 + GetConsoleMode = WINFUNCTYPE(BOOL, HANDLE, POINTER(DWORD))(("GetConsoleMode", windll.kernel32)) + INVALID_HANDLE_VALUE = DWORD(-1).value + + def not_a_console(handle): + if handle == INVALID_HANDLE_VALUE or handle is None: + return True + return ((GetFileType(handle) & ~FILE_TYPE_REMOTE) != FILE_TYPE_CHAR + or GetConsoleMode(handle, byref(DWORD())) == 0) + + old_stdout_fileno = None + old_stderr_fileno = None + if hasattr(sys.stdout, 'fileno'): + old_stdout_fileno = sys.stdout.fileno() + if hasattr(sys.stderr, 'fileno'): + old_stderr_fileno = sys.stderr.fileno() + STDOUT_FILENO = 1 STDERR_FILENO = 2 - real_stdout = hasattr(sys.stdout, 'fileno') and sys.stdout.fileno() == STDOUT_FILENO - real_stderr = hasattr(sys.stderr, 'fileno') and sys.stderr.fileno() == STDERR_FILENO - - def force_utf8(stream, name): - if hasattr(stream, 'encoding') and canonical_encoding(stream.encoding) != 'utf-8': - log.msg("%s (%r) had encoding %r, but we're going to write UTF-8 to it" % - (name, stream, stream.encoding), level=log.CURIOUS) - stream.encoding = 'utf-8' + real_stdout = (old_stdout_fileno == STDOUT_FILENO) + real_stderr = (old_stderr_fileno == STDERR_FILENO) - if not real_stdout: - force_utf8(sys.stdout, "sys.stdout") + if real_stdout: + hStdout = GetStdHandle(STD_OUTPUT_HANDLE) + if not_a_console(hStdout): + real_stdout = False - if not real_stderr: - force_utf8(sys.stderr, "sys.stderr") + if real_stderr: + hStderr = GetStdHandle(STD_ERROR_HANDLE) + if not_a_console(hStderr): + real_stderr = False if real_stdout or real_stderr: - # FILE * _fdopen(int fd, const char *mode); - # #define _IOLBF 0x0040 - # int setvbuf(FILE *stream, char *buffer, int mode, size_t size); - # #define _O_U8TEXT 0x40000 - # int _setmode(int fd, int mode); - # int fputws(const wchar_t *ws, FILE *stream); - # int fflush(FILE *stream); - - c_runtime = cdll.msvcrt - NULL = None - _fdopen = CFUNCTYPE(c_void_p, c_int, c_char_p)(("_fdopen", c_runtime)) - _IOLBF = 0x0040 - setvbuf = CFUNCTYPE(c_int, c_void_p, c_char_p, c_int, c_size_t)(("setvbuf", c_runtime)) - _O_U8TEXT = 0x40000 - _setmode = CFUNCTYPE(c_int, c_int, c_int)(("_setmode", c_runtime)) - fputws = CFUNCTYPE(c_int, c_wchar_p, c_void_p)(("fputws", c_runtime)); - fflush = CFUNCTYPE(c_int, c_void_p)(("fflush", c_runtime)); - - buffer_chars = 1024 + # BOOL WINAPI WriteConsoleW(HANDLE hOutput, LPWSTR lpBuffer, DWORD nChars, + # LPDWORD lpCharsWritten, LPVOID lpReserved); - class UnicodeOutput: - def __init__(self, fileno, name): - self._stream = _fdopen(fileno, "w") - assert self._stream is not NULL + WriteConsoleW = WINFUNCTYPE(BOOL, HANDLE, LPWSTR, DWORD, POINTER(DWORD), LPVOID) \ + (("WriteConsoleW", windll.kernel32)) - # Deep magic. MSVCRT supports writing wide-oriented output to stdout/stderr - # to the console using the Unicode APIs, but it does the conversion in the - # stdio buffer, so you need that buffer to be as large as the maximum amount - # you're going to write in a single call (in bytes, not characters). - setvbuf(self._stream, NULL, _IOLBF, buffer_chars*4 + 100) - _setmode(fileno, _O_U8TEXT) + # If any exception occurs in this code, we'll probably try to print it on stderr, + # which makes for frustrating debugging if stderr is directed to this code. + # So be paranoid about catching errors and reporting them to original_stderr, + # so that we can at least see them. + class UnicodeOutput: + def __init__(self, hConsole, stream, fileno, name): + self._hConsole = hConsole + self._stream = stream self._fileno = fileno self.closed = False self.softspace = False self.mode = 'w' self.encoding = 'utf-8' self.name = name + if hasattr(stream, 'encoding') and canonical_encoding(stream.encoding) != 'utf-8': + log.msg("%s (%r) had encoding %r, but we're going to write UTF-8 to it" % + (name, stream, stream.encoding), level=log.CURIOUS) + self.flush() def isatty(self): return False def close(self): + # don't really close the handle, that would only cause problems self.closed = True - self.flush() def fileno(self): return self._fileno def flush(self): - fflush(self._stream) + if self._hConsole is None: + try: + self._stream.flush() + except Exception, e: + print >>original_stderr, repr(e) + raise def write(self, text): - if not isinstance(text, unicode): - text = str(text).decode('utf-8') - for i in xrange(0, len(text), buffer_chars): - fputws(text[i:(i+buffer_chars)], self._stream) - fflush(self._stream) + try: + if self._hConsole is None: + if isinstance(text, unicode): + text = text.encode('utf-8') + self._stream.write(text) + else: + if not isinstance(text, unicode): + text = str(text).decode('utf-8') + remaining = len(text) + while remaining > 0: + n = DWORD(0) + retval = WriteConsoleW(self._hConsole, text, remaining, byref(n), None) + if retval == 0 or n.value == 0: + raise IOError("could not write to %s [WriteConsoleW returned %r, n.value = %r]" + % (self.name, retval, n.value)) + remaining -= n.value + if remaining == 0: break + text = text[n.value:] + except Exception, e: + print >>original_stderr, repr(e) + raise def writelines(self, lines): - for line in lines: - self.write(line) + try: + for line in lines: + self.write(line) + except Exception, e: + print >>original_stderr, repr(e) + raise if real_stdout: - sys.stdout = UnicodeOutput(STDOUT_FILENO, '') + sys.stdout = UnicodeOutput(hStdout, None, STDOUT_FILENO, '') + else: + sys.stdout = UnicodeOutput(None, sys.stdout, old_stdout_fileno, '') if real_stderr: - sys.stderr = UnicodeOutput(STDERR_FILENO, '') + sys.stderr = UnicodeOutput(hStderr, None, STDERR_FILENO, '') + else: + sys.stderr = UnicodeOutput(None, sys.stderr, old_stderr_fileno, '') except Exception, e: - log.msg("exception %r while fixing up sys.stdout and sys.stderr" % (e,), level=log.WEIRD) + print >>original_stderr, "exception %r while fixing up sys.stdout and sys.stderr" % (e,) + log.msg("exception %r while fixing up sys.stdout and sys.stderr" % (e,), log.WEIRD) # Unmangle command-line arguments. - GetCommandLineW = WINFUNCTYPE(c_wchar_p)(("GetCommandLineW", windll.kernel32)) - CommandLineToArgvW = WINFUNCTYPE(POINTER(c_wchar_p), c_wchar_p, POINTER(c_int)) \ + GetCommandLineW = WINFUNCTYPE(LPWSTR)(("GetCommandLineW", windll.kernel32)) + CommandLineToArgvW = WINFUNCTYPE(POINTER(LPWSTR), LPCWSTR, POINTER(c_int)) \ (("CommandLineToArgvW", windll.shell32)) argc = c_int(0)