Mailman 3 December 2010 - Python-checkins

r87524 - python/branches/py3k/Doc/extending/windows.rst
by georg.brandl Dec. 28, 2010

Dec. 28, 2010

Author: georg.brandl Date: Tue Dec 28 10:29:19 2010 New Revision: 87524 Log: Fix advice: call PyType_Ready to fill in ob_type of custom types. Modified: python/branches/py3k/Doc/extending/windows.rst Modified: python/branches/py3k/Doc/extending/windows.rst ============================================================================== --- python/branches/py3k/Doc/extending/windows.rst (original) +++ python/branches/py3k/Doc/extending/windows.rst Tue Dec 28 10:29:19 2010 @@ -110,7 +110,7 @@ Now your options are: #. Copy :file:`example.sln` and :file:`example.vcproj`, rename them to - :file:`spam.\*`, and edit them by hand, or + :file:`spam.\*`, and edit them by hand, or #. Create a brand new project; instructions are below. @@ -179,8 +179,8 @@ and add the following to the module initialization function:: - MyObject_Type.ob_type = &PyType_Type; - + if (PyType_Ready(&MyObject_Type) < 0) + return NULL; .. _dynamic-linking:

1 0

r87522 - python/branches/py3k/Doc/library/functions.rst
by georg.brandl Dec. 28, 2010

Dec. 28, 2010

Author: georg.brandl Date: Tue Dec 28 10:16:12 2010 New Revision: 87522 Log: Replace sys.maxint mention by sys.maxsize. Modified: python/branches/py3k/Doc/library/functions.rst Modified: python/branches/py3k/Doc/library/functions.rst ============================================================================== --- python/branches/py3k/Doc/library/functions.rst (original) +++ python/branches/py3k/Doc/library/functions.rst Tue Dec 28 10:16:12 2010 @@ -1049,7 +1049,7 @@ >>> r[-1] 18 - Ranges containing absolute values larger than ``sys.maxint`` are permitted + Ranges containing absolute values larger than :data:`sys.maxsize` are permitted but some features (such as :func:`len`) will raise :exc:`OverflowError`. .. versionchanged:: 3.2

1 0

r87505 - in python/branches/py3k: Doc/c-api/unicode.rst Include/unicodeobject.h
by victor.stinner Dec. 28, 2010

Dec. 28, 2010

Author: victor.stinner Date: Mon Dec 27 02:49:29 2010 New Revision: 87505 Log: Issue #9738: document encodings of unicode functions Modified: python/branches/py3k/Doc/c-api/unicode.rst python/branches/py3k/Include/unicodeobject.h Modified: python/branches/py3k/Doc/c-api/unicode.rst ============================================================================== --- python/branches/py3k/Doc/c-api/unicode.rst (original) +++ python/branches/py3k/Doc/c-api/unicode.rst Mon Dec 27 02:49:29 2010 @@ -1063,7 +1063,8 @@ .. c:function:: int PyUnicode_CompareWithASCIIString(PyObject *uni, char *string) Compare a unicode object, *uni*, with *string* and return -1, 0, 1 for less - than, equal, and greater than, respectively. + than, equal, and greater than, respectively. *string* is an ASCII-encoded + string (it is interpreted as ISO-8859-1). .. c:function:: int PyUnicode_RichCompare(PyObject *left, PyObject *right, int op) Modified: python/branches/py3k/Include/unicodeobject.h ============================================================================== --- python/branches/py3k/Include/unicodeobject.h (original) +++ python/branches/py3k/Include/unicodeobject.h Mon Dec 27 02:49:29 2010 @@ -443,14 +443,14 @@ /* Similar to PyUnicode_FromUnicode(), but u points to UTF-8 encoded bytes */ PyAPI_FUNC(PyObject*) PyUnicode_FromStringAndSize( - const char *u, /* char buffer */ - Py_ssize_t size /* size of buffer */ + const char *u /* UTF-8 encoded string */ + Py_ssize_t size /* size of buffer */ ); /* Similar to PyUnicode_FromUnicode(), but u points to null-terminated UTF-8 encoded bytes */ PyAPI_FUNC(PyObject*) PyUnicode_FromString( - const char *u /* string */ + const char *u /* UTF-8 encoded string */ ); /* Return a read-only pointer to the Unicode object's internal @@ -551,7 +551,9 @@ PyAPI_FUNC(void) PyUnicode_InternInPlace(PyObject **); PyAPI_FUNC(void) PyUnicode_InternImmortal(PyObject **); -PyAPI_FUNC(PyObject *) PyUnicode_InternFromString(const char *); +PyAPI_FUNC(PyObject *) PyUnicode_InternFromString( + const char *u /* UTF-8 encoded string */ + ); #ifndef Py_LIMITED_API PyAPI_FUNC(void) _Py_ReleaseInternedUnicodeStrings(void); #endif @@ -1455,7 +1457,7 @@ PyAPI_FUNC(int) PyUnicode_CompareWithASCIIString( PyObject *left, - const char *right + const char *right /* ASCII-encoded string */ ); /* Rich compare two strings and return one of the following:

2 1

r87504 - in python/branches/py3k: Doc/c-api/exceptions.rst Include/pyerrors.h Include/warnings.h
by victor.stinner Dec. 28, 2010

Dec. 28, 2010

Author: victor.stinner Date: Mon Dec 27 02:49:26 2010 New Revision: 87504 Log: Issue #9738: Document encodings of error and warning functions Modified: python/branches/py3k/Doc/c-api/exceptions.rst python/branches/py3k/Include/pyerrors.h python/branches/py3k/Include/warnings.h Modified: python/branches/py3k/Doc/c-api/exceptions.rst ============================================================================== --- python/branches/py3k/Doc/c-api/exceptions.rst (original) +++ python/branches/py3k/Doc/c-api/exceptions.rst Mon Dec 27 02:49:26 2010 @@ -148,7 +148,8 @@ This function sets the error indicator and returns *NULL*. *exception* should be a Python exception class. The *format* and subsequent parameters help format the error message; they have the same meaning and - values as in :c:func:`PyUnicode_FromFormat`. + values as in :c:func:`PyUnicode_FromFormat`. *format* is an ASCII-encoding + string. .. c:function:: void PyErr_SetNone(PyObject *type) @@ -218,7 +219,8 @@ Similar to :c:func:`PyErr_SetFromWindowsErr`, with the additional behavior that if *filename* is not *NULL*, it is passed to the constructor of - :exc:`WindowsError` as a third parameter. Availability: Windows. + :exc:`WindowsError` as a third parameter. *filename* is decoded from UTF-8. + Availability: Windows. .. c:function:: PyObject* PyErr_SetExcFromWindowsErrWithFilename(PyObject *type, int ierr, char *filename) @@ -232,7 +234,8 @@ Set file, line, and offset information for the current exception. If the current exception is not a :exc:`SyntaxError`, then it sets additional attributes, which make the exception printing subsystem think the exception - is a :exc:`SyntaxError`. + is a :exc:`SyntaxError`. *filename* is decoded from the filesystem encoding + (:func:`sys.getfilesystemencoding`). .. versionadded:: 3.2 @@ -254,7 +257,7 @@ .. c:function:: int PyErr_WarnEx(PyObject *category, char *message, int stack_level) Issue a warning message. The *category* argument is a warning category (see - below) or *NULL*; the *message* argument is a message string. *stack_level* is a + below) or *NULL*; the *message* argument is an UTF-8 encoded string. *stack_level* is a positive number giving a number of stack frames; the warning will be issued from the currently executing line of code in that stack frame. A *stack_level* of 1 is the function calling :c:func:`PyErr_WarnEx`, 2 is the function above that, @@ -294,13 +297,15 @@ is a straightforward wrapper around the Python function :func:`warnings.warn_explicit`, see there for more information. The *module* and *registry* arguments may be set to *NULL* to get the default effect - described there. + described there. *message*, *filename* and *module* are UTF-8 encoded + strings. .. c:function:: int PyErr_WarnFormat(PyObject *category, Py_ssize_t stack_level, const char *format, ...) Function similar to :c:func:`PyErr_WarnEx`, but use - :c:func:`PyUnicode_FromFormat` to format the warning message. + :c:func:`PyUnicode_FromFormat` to format the warning message. *format* is + an ASCII-encoded string. .. versionadded:: 3.2 @@ -437,17 +442,19 @@ .. c:function:: PyObject* PyUnicodeDecodeError_Create(const char *encoding, const char *object, Py_ssize_t length, Py_ssize_t start, Py_ssize_t end, const char *reason) Create a :class:`UnicodeDecodeError` object with the attributes *encoding*, - *object*, *length*, *start*, *end* and *reason*. + *object*, *length*, *start*, *end* and *reason*. *encoding* and *reason* are + UTF-8 encoded strings. .. c:function:: PyObject* PyUnicodeEncodeError_Create(const char *encoding, const Py_UNICODE *object, Py_ssize_t length, Py_ssize_t start, Py_ssize_t end, const char *reason) Create a :class:`UnicodeEncodeError` object with the attributes *encoding*, - *object*, *length*, *start*, *end* and *reason*. + *object*, *length*, *start*, *end* and *reason*. *encoding* and *reason* are + UTF-8 encoded strings. .. c:function:: PyObject* PyUnicodeTranslateError_Create(const Py_UNICODE *object, Py_ssize_t length, Py_ssize_t start, Py_ssize_t end, const char *reason) Create a :class:`UnicodeTranslateError` object with the attributes *object*, - *length*, *start*, *end* and *reason*. + *length*, *start*, *end* and *reason*. *reason* is an UTF-8 encoded string. .. c:function:: PyObject* PyUnicodeDecodeError_GetEncoding(PyObject *exc) PyObject* PyUnicodeEncodeError_GetEncoding(PyObject *exc) Modified: python/branches/py3k/Include/pyerrors.h ============================================================================== --- python/branches/py3k/Include/pyerrors.h (original) +++ python/branches/py3k/Include/pyerrors.h Mon Dec 27 02:49:26 2010 @@ -201,7 +201,9 @@ PyAPI_FUNC(PyObject *) PyErr_SetFromWindowsErrWithFilenameObject( int, const char *); PyAPI_FUNC(PyObject *) PyErr_SetFromWindowsErrWithFilename( - int, const char *); + int ierr, + const char *filename /* decoded from UTF-8 */ + ); #ifndef Py_LIMITED_API /* XXX redeclare to use WSTRING */ PyAPI_FUNC(PyObject *) PyErr_SetFromWindowsErrWithUnicodeFilename( @@ -211,7 +213,10 @@ PyAPI_FUNC(PyObject *) PyErr_SetExcFromWindowsErrWithFilenameObject( PyObject *,int, PyObject *); PyAPI_FUNC(PyObject *) PyErr_SetExcFromWindowsErrWithFilename( - PyObject *,int, const char *); + PyObject *exc, + int ierr, + const char *filename /* decoded from UTF-8 */ + ); #ifndef Py_LIMITED_API PyAPI_FUNC(PyObject *) PyErr_SetExcFromWindowsErrWithUnicodeFilename( PyObject *,int, const Py_UNICODE *); @@ -243,27 +248,51 @@ #endif /* Support for adding program text to SyntaxErrors */ -PyAPI_FUNC(void) PyErr_SyntaxLocation(const char *, int); -PyAPI_FUNC(void) PyErr_SyntaxLocationEx(const char *, int, int); -PyAPI_FUNC(PyObject *) PyErr_ProgramText(const char *, int); +PyAPI_FUNC(void) PyErr_SyntaxLocation( + const char *filename, /* decoded from the filesystem encoding */ + int lineno); +PyAPI_FUNC(void) PyErr_SyntaxLocationEx( + const char *filename, /* decoded from the filesystem encoding */ + int lineno, + int col_offset); +PyAPI_FUNC(PyObject *) PyErr_ProgramText( + const char *filename, /* decoded from the filesystem encoding */ + int lineno); /* The following functions are used to create and modify unicode exceptions from C */ /* create a UnicodeDecodeError object */ PyAPI_FUNC(PyObject *) PyUnicodeDecodeError_Create( - const char *, const char *, Py_ssize_t, Py_ssize_t, Py_ssize_t, const char *); + const char *encoding, /* UTF-8 encoded string */ + const char *object, + Py_ssize_t length, + Py_ssize_t start, + Py_ssize_t end, + const char *reason /* UTF-8 encoded string */ + ); /* create a UnicodeEncodeError object */ #ifndef Py_LIMITED_API PyAPI_FUNC(PyObject *) PyUnicodeEncodeError_Create( - const char *, const Py_UNICODE *, Py_ssize_t, Py_ssize_t, Py_ssize_t, const char *); + const char *encoding, /* UTF-8 encoded string */ + const Py_UNICODE *object, + Py_ssize_t length, + Py_ssize_t start, + Py_ssize_t end, + const char *reason /* UTF-8 encoded string */ + ); #endif /* create a UnicodeTranslateError object */ #ifndef Py_LIMITED_API PyAPI_FUNC(PyObject *) PyUnicodeTranslateError_Create( - const Py_UNICODE *, Py_ssize_t, Py_ssize_t, Py_ssize_t, const char *); + const Py_UNICODE *object, + Py_ssize_t length, + Py_ssize_t start, + Py_ssize_t end, + const char *reason /* UTF-8 encoded string */ + ); #endif /* get the encoding attribute */ @@ -307,11 +336,17 @@ /* assign a new value to the reason attribute return 0 on success, -1 on failure */ PyAPI_FUNC(int) PyUnicodeEncodeError_SetReason( - PyObject *, const char *); + PyObject *exc, + const char *reason /* UTF-8 encoded string */ + ); PyAPI_FUNC(int) PyUnicodeDecodeError_SetReason( - PyObject *, const char *); + PyObject *exc, + const char *reason /* UTF-8 encoded string */ + ); PyAPI_FUNC(int) PyUnicodeTranslateError_SetReason( - PyObject *, const char *); + PyObject *exc, + const char *reason /* UTF-8 encoded string */ + ); /* These APIs aren't really part of the error implementation, but Modified: python/branches/py3k/Include/warnings.h ============================================================================== --- python/branches/py3k/Include/warnings.h (original) +++ python/branches/py3k/Include/warnings.h Mon Dec 27 02:49:26 2010 @@ -8,10 +8,22 @@ PyAPI_FUNC(PyObject*) _PyWarnings_Init(void); #endif -PyAPI_FUNC(int) PyErr_WarnEx(PyObject *, const char *, Py_ssize_t); -PyAPI_FUNC(int) PyErr_WarnFormat(PyObject *, Py_ssize_t, const char *, ...); -PyAPI_FUNC(int) PyErr_WarnExplicit(PyObject *, const char *, const char *, int, - const char *, PyObject *); +PyAPI_FUNC(int) PyErr_WarnEx( + PyObject *category, + const char *message, /* UTF-8 encoded string */ + Py_ssize_t stack_level); +PyAPI_FUNC(int) PyErr_WarnFormat( + PyObject *category, + Py_ssize_t stack_level, + const char *format, /* ASCII-encoded string */ + ...); +PyAPI_FUNC(int) PyErr_WarnExplicit( + PyObject *category, + const char *message, /* UTF-8 encoded string */ + const char *filename, /* UTF-8 encoded string */ + int lineno, + const char *module, /* UTF-8 encoded string */ + PyObject *registry); /* DEPRECATED: Use PyErr_WarnEx() instead. */ #ifndef Py_LIMITED_API

2 1

Daily py3k reference leaks (r87521): sum=0
by solipsis＠pitrou.net Dec. 28, 2010

Dec. 28, 2010

py3k results for svn r87521 (hg cset 1527e286701e) -------------------------------------------------- Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/py3k/refleaks/reflogNqibML', '-x']

1 0

r87521 - python/branches/py3k/Include/pyerrors.h
by victor.stinner Dec. 28, 2010

Dec. 28, 2010

Author: victor.stinner Date: Tue Dec 28 01:59:03 2010 New Revision: 87521 Log: Issue #10780: Remove commas at the end of the argument list Forbidden in C, stupid language! Modified: python/branches/py3k/Include/pyerrors.h Modified: python/branches/py3k/Include/pyerrors.h ============================================================================== --- python/branches/py3k/Include/pyerrors.h (original) +++ python/branches/py3k/Include/pyerrors.h Tue Dec 28 01:59:03 2010 @@ -202,7 +202,7 @@ int, const char *); PyAPI_FUNC(PyObject *) PyErr_SetFromWindowsErrWithFilename( int ierr, - const char *filename, /* decoded from the filesystem encoding */ + const char *filename /* decoded from the filesystem encoding */ ); #ifndef Py_LIMITED_API /* XXX redeclare to use WSTRING */ @@ -215,7 +215,7 @@ PyAPI_FUNC(PyObject *) PyErr_SetExcFromWindowsErrWithFilename( PyObject *exc, int ierr, - const char *filename, /* decoded from the filesystem encoding */ + const char *filename /* decoded from the filesystem encoding */ ); #ifndef Py_LIMITED_API PyAPI_FUNC(PyObject *) PyErr_SetExcFromWindowsErrWithUnicodeFilename(

1 0

r87520 - python/branches/py3k/Doc/library/ctypes.rst
by victor.stinner Dec. 28, 2010

Dec. 28, 2010

Author: victor.stinner Date: Tue Dec 28 01:59:02 2010 New Revision: 87520 Log: Issue #8966: Remove the documentation of ctypes.set_conversion_mode() Function removed by r83195. Modified: python/branches/py3k/Doc/library/ctypes.rst Modified: python/branches/py3k/Doc/library/ctypes.rst ============================================================================== --- python/branches/py3k/Doc/library/ctypes.rst (original) +++ python/branches/py3k/Doc/library/ctypes.rst Tue Dec 28 01:59:02 2010 @@ -1930,22 +1930,6 @@ but it is possible to enlarge the buffer. -.. function:: set_conversion_mode(encoding, errors) - - This function sets the rules that ctypes objects use when converting between - bytes objects and (unicode) strings. *encoding* must be a string specifying an - encoding, like ``'utf-8'`` or ``'mbcs'``, *errors* must be a string specifying - the error handling on encoding/decoding errors. Examples of possible values are - ``'strict'``, ``'replace'``, or ``'ignore'``. - - :func:`set_conversion_mode` returns a 2-tuple containing the previous - conversion rules. On windows, the initial conversion rules are ``('mbcs', - 'ignore')``, on other systems ``('ascii', 'strict')``. - - You can set the *encoding* to ``'undefined'`` to completely disable automatic - conversions. - - .. function:: set_errno(value) Set the current value of the ctypes-private copy of the system :data:`errno`

1 0

r87519 - in python/branches/py3k: Doc/c-api/exceptions.rst Include/pyerrors.h Misc/NEWS Python/errors.c
by victor.stinner Dec. 28, 2010

Dec. 28, 2010

Author: victor.stinner Date: Tue Dec 28 01:28:21 2010 New Revision: 87519 Log: Issue #10780: PyErr_SetFromWindowsErrWithFilename() and PyErr_SetExcFromWindowsErrWithFilename() decode the filename from the filesystem encoding instead of UTF-8. Modified: python/branches/py3k/Doc/c-api/exceptions.rst python/branches/py3k/Include/pyerrors.h python/branches/py3k/Misc/NEWS python/branches/py3k/Python/errors.c Modified: python/branches/py3k/Doc/c-api/exceptions.rst ============================================================================== --- python/branches/py3k/Doc/c-api/exceptions.rst (original) +++ python/branches/py3k/Doc/c-api/exceptions.rst Tue Dec 28 01:28:21 2010 @@ -219,8 +219,9 @@ Similar to :c:func:`PyErr_SetFromWindowsErr`, with the additional behavior that if *filename* is not *NULL*, it is passed to the constructor of - :exc:`WindowsError` as a third parameter. *filename* is decoded from UTF-8. - Availability: Windows. + :exc:`WindowsError` as a third parameter. *filename* is decoded from the + filesystem encoding (:func:`sys.getfilesystemencoding`). Availability: + Windows. .. c:function:: PyObject* PyErr_SetExcFromWindowsErrWithFilename(PyObject *type, int ierr, char *filename) Modified: python/branches/py3k/Include/pyerrors.h ============================================================================== --- python/branches/py3k/Include/pyerrors.h (original) +++ python/branches/py3k/Include/pyerrors.h Tue Dec 28 01:28:21 2010 @@ -202,7 +202,7 @@ int, const char *); PyAPI_FUNC(PyObject *) PyErr_SetFromWindowsErrWithFilename( int ierr, - const char *filename /* decoded from UTF-8 */ + const char *filename, /* decoded from the filesystem encoding */ ); #ifndef Py_LIMITED_API /* XXX redeclare to use WSTRING */ @@ -215,7 +215,7 @@ PyAPI_FUNC(PyObject *) PyErr_SetExcFromWindowsErrWithFilename( PyObject *exc, int ierr, - const char *filename /* decoded from UTF-8 */ + const char *filename, /* decoded from the filesystem encoding */ ); #ifndef Py_LIMITED_API PyAPI_FUNC(PyObject *) PyErr_SetExcFromWindowsErrWithUnicodeFilename( Modified: python/branches/py3k/Misc/NEWS ============================================================================== --- python/branches/py3k/Misc/NEWS (original) +++ python/branches/py3k/Misc/NEWS Tue Dec 28 01:28:21 2010 @@ -8,6 +8,10 @@ Core and Builtins ----------------- +- Issue #10780: PyErr_SetFromWindowsErrWithFilename() and + PyErr_SetExcFromWindowsErrWithFilename() decode the filename from the + filesystem encoding instead of UTF-8. + - Issue #10779: PyErr_WarnExplicit() decodes the filename from the filesystem encoding instead of UTF-8. Modified: python/branches/py3k/Python/errors.c ============================================================================== --- python/branches/py3k/Python/errors.c (original) +++ python/branches/py3k/Python/errors.c Tue Dec 28 01:28:21 2010 @@ -515,7 +515,7 @@ int ierr, const char *filename) { - PyObject *name = filename ? PyUnicode_FromString(filename) : NULL; + PyObject *name = filename ? PyUnicode_DecodeFSDefault(filename) : NULL; PyObject *ret = PyErr_SetExcFromWindowsErrWithFilenameObject(exc, ierr, name); @@ -552,7 +552,7 @@ int ierr, const char *filename) { - PyObject *name = filename ? PyUnicode_FromString(filename) : NULL; + PyObject *name = filename ? PyUnicode_DecodeFSDefault(filename) : NULL; PyObject *result = PyErr_SetExcFromWindowsErrWithFilenameObject( PyExc_WindowsError, ierr, name);

1 0

r87518 - python/branches/py3k/Parser/tokenizer.c
by victor.stinner Dec. 27, 2010

Dec. 27, 2010

Author: victor.stinner Date: Mon Dec 27 21:12:13 2010 New Revision: 87518 Log: Issue #10778: decoding_fgets() decodes the filename from the filesystem encoding instead of UTF-8. Modified: python/branches/py3k/Parser/tokenizer.c Modified: python/branches/py3k/Parser/tokenizer.c ============================================================================== --- python/branches/py3k/Parser/tokenizer.c (original) +++ python/branches/py3k/Parser/tokenizer.c Mon Dec 27 21:12:13 2010 @@ -545,6 +545,7 @@ { char *line = NULL; int badchar = 0; + PyObject *filename; for (;;) { if (tok->decoding_state == STATE_NORMAL) { /* We already have a codec associated with @@ -585,12 +586,16 @@ if (badchar) { /* Need to add 1 to the line number, since this line has not been counted, yet. */ - PyErr_Format(PyExc_SyntaxError, - "Non-UTF-8 code starting with '\\x%.2x' " - "in file %.200s on line %i, " - "but no encoding declared; " - "see http://python.org/dev/peps/pep-0263/ for details", - badchar, tok->filename, tok->lineno + 1); + filename = PyUnicode_DecodeFSDefault(tok->filename); + if (filename != NULL) { + PyErr_Format(PyExc_SyntaxError, + "Non-UTF-8 code starting with '\\x%.2x' " + "in file %.200U on line %i, " + "but no encoding declared; " + "see http://python.org/dev/peps/pep-0263/ for details", + badchar, filename, tok->lineno + 1); + Py_DECREF(filename); + } return error_ret(tok); } #endif

1 0

r87517 - in python/branches/py3k: Doc/c-api/exceptions.rst Include/warnings.h Misc/NEWS Python/_warnings.c
by victor.stinner Dec. 27, 2010

Dec. 27, 2010

Author: victor.stinner Date: Mon Dec 27 21:10:36 2010 New Revision: 87517 Log: Issue #10779: PyErr_WarnExplicit() decodes the filename from the filesystem encoding instead of UTF-8. Modified: python/branches/py3k/Doc/c-api/exceptions.rst python/branches/py3k/Include/warnings.h python/branches/py3k/Misc/NEWS python/branches/py3k/Python/_warnings.c Modified: python/branches/py3k/Doc/c-api/exceptions.rst ============================================================================== --- python/branches/py3k/Doc/c-api/exceptions.rst (original) +++ python/branches/py3k/Doc/c-api/exceptions.rst Mon Dec 27 21:10:36 2010 @@ -297,8 +297,9 @@ is a straightforward wrapper around the Python function :func:`warnings.warn_explicit`, see there for more information. The *module* and *registry* arguments may be set to *NULL* to get the default effect - described there. *message*, *filename* and *module* are UTF-8 encoded - strings. + described there. *message* and *module* are UTF-8 encoded strings, + *filename* is decoded from the filesystem encoding + (:func:`sys.getfilesystemencoding`). .. c:function:: int PyErr_WarnFormat(PyObject *category, Py_ssize_t stack_level, const char *format, ...) Modified: python/branches/py3k/Include/warnings.h ============================================================================== --- python/branches/py3k/Include/warnings.h (original) +++ python/branches/py3k/Include/warnings.h Mon Dec 27 21:10:36 2010 @@ -20,7 +20,7 @@ PyAPI_FUNC(int) PyErr_WarnExplicit( PyObject *category, const char *message, /* UTF-8 encoded string */ - const char *filename, /* UTF-8 encoded string */ + const char *filename, /* decoded from the filesystem encoding */ int lineno, const char *module, /* UTF-8 encoded string */ PyObject *registry); Modified: python/branches/py3k/Misc/NEWS ============================================================================== --- python/branches/py3k/Misc/NEWS (original) +++ python/branches/py3k/Misc/NEWS Mon Dec 27 21:10:36 2010 @@ -8,6 +8,9 @@ Core and Builtins ----------------- +- Issue #10779: PyErr_WarnExplicit() decodes the filename from the filesystem + encoding instead of UTF-8. + Library ------- Modified: python/branches/py3k/Python/_warnings.c ============================================================================== --- python/branches/py3k/Python/_warnings.c (original) +++ python/branches/py3k/Python/_warnings.c Mon Dec 27 21:10:36 2010 @@ -783,7 +783,7 @@ { PyObject *res; PyObject *message = PyUnicode_FromString(text); - PyObject *filename = PyUnicode_FromString(filename_str); + PyObject *filename = PyUnicode_DecodeFSDefault(filename_str); PyObject *module = NULL; int ret = -1;

1 0