Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-31 13:41:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Issue #22977: Fixed formatting Windows error messages on Wine.

Browse source 
Patch by Martin Panter.
This commit is contained in:
Serhiy Storchaka 2015-04-02 09:50:06 +03:00
commit 1399a01b90
3 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Lib/test/test_exceptions.py
View file

@ -6,10 +6,11 @@
import pickle
import weakref
import errno
import ctypes
from test.support import (TESTFN, captured_output, check_impl_detail,
check_warnings, cpython_only, gc_collect, run_unittest,
no_tracing, unlink)
no_tracing, unlink, get_attribute)
class NaiveException(Exception):
def __init__(self, x):
@ -245,6 +246,13 @@ def test_WindowsError(self):
self.assertEqual(w.strerror, 'foo')
self.assertEqual(w.filename, None)
def test_windows_message(self):
"""Should fill in unknown error code in Windows error message"""
windll = get_attribute(ctypes, "windll")
code = int.from_bytes(b"\xE0msc", "big")
with self.assertRaisesRegex(OSError, hex(code)):
windll.kernel32.RaiseException(code, 0, 0, None)
def testAttributes(self):
# test that exception attributes are happy

3
Misc/NEWS
View file

@ -10,6 +10,9 @@ Release date: XXX
Core and Builtins
-----------------
- Issue #22977: Fixed formatting Windows error messages on Wine.
Patch by Martin Panter.
Library
-------

4
Python/errors.c
View file

@ -491,7 +491,7 @@ PyErr_SetFromErrnoWithFilenameObjects(PyObject *exc, PyObject *filenameObject, P
/* Only ever seen this in out-of-mem
situations */
s_buf = NULL;
message = PyUnicode_FromFormat("Windows Error 0x%X", i);
message = PyUnicode_FromFormat("Windows Error 0x%x", i);
} else {
/* remove trailing cr/lf and dots */
while (len > 0 && (s_buf[len-1] <= L' ' || s_buf[len-1] == L'.'))
@ -600,7 +600,7 @@ PyObject *PyErr_SetExcFromWindowsErrWithFilenameObjects(
NULL); /* no args */
if (len==0) {
/* Only seen this in out of mem situations */
message = PyUnicode_FromFormat("Windows Error 0x%X", err);
message = PyUnicode_FromFormat("Windows Error 0x%x", err);
s_buf = NULL;
} else {
/* remove trailing cr/lf and dots */