Mailman 3 July 2019 - Python-checkins

bpo-37730: Fix usage of NotImplemented instead of NotImplementedError in docs. (GH-15062)
by Serhiy Storchaka 31 Jul '19

31 Jul '19

https://github.com/python/cpython/commit/ed5e8e06cbf766e89d6c58a882ee024abb… commit: ed5e8e06cbf766e89d6c58a882ee024abb5b2ed7 branch: master author: David H <dheiberg(a)mozilla.com> committer: Serhiy Storchaka <storchaka(a)gmail.com> date: 2019-08-01T01:49:55+03:00 summary: bpo-37730: Fix usage of NotImplemented instead of NotImplementedError in docs. (GH-15062) files: M Doc/library/winreg.rst M PC/clinic/winreg.c.h M PC/winreg.c diff --git a/Doc/library/winreg.rst b/Doc/library/winreg.rst index e9c026102273..cb67f2f39d76 100644 --- a/Doc/library/winreg.rst +++ b/Doc/library/winreg.rst @@ -456,7 +456,7 @@ This module offers the following functions: *key* is an already open key, or one of the predefined :ref:`HKEY_* constants <hkey-constants>`. - Will generally raise :exc:`NotImplemented` if executed on a 32-bit operating + Will generally raise :exc:`NotImplementedError` if executed on a 32-bit operating system. If the key is not on the reflection list, the function succeeds but has no @@ -471,7 +471,7 @@ This module offers the following functions: *key* is an already open key, or one of the predefined :ref:`HKEY_* constants <hkey-constants>`. - Will generally raise :exc:`NotImplemented` if executed on a 32-bit operating + Will generally raise :exc:`NotImplementedError` if executed on a 32-bit operating system. Restoring reflection for a key does not affect reflection of any subkeys. @@ -486,7 +486,7 @@ This module offers the following functions: Returns ``True`` if reflection is disabled. - Will generally raise :exc:`NotImplemented` if executed on a 32-bit + Will generally raise :exc:`NotImplementedError` if executed on a 32-bit operating system. diff --git a/PC/clinic/winreg.c.h b/PC/clinic/winreg.c.h index 50210250ed19..b7af1855ac54 100644 --- a/PC/clinic/winreg.c.h +++ b/PC/clinic/winreg.c.h @@ -1029,7 +1029,7 @@ PyDoc_STRVAR(winreg_DisableReflectionKey__doc__, " key\n" " An already open key, or any one of the predefined HKEY_* constants.\n" "\n" -"Will generally raise NotImplemented if executed on a 32bit OS.\n" +"Will generally raise NotImplementedError if executed on a 32bit OS.\n" "\n" "If the key is not on the reflection list, the function succeeds but has\n" "no effect. Disabling reflection for a key does not affect reflection\n" @@ -1065,7 +1065,7 @@ PyDoc_STRVAR(winreg_EnableReflectionKey__doc__, " key\n" " An already open key, or any one of the predefined HKEY_* constants.\n" "\n" -"Will generally raise NotImplemented if executed on a 32bit OS.\n" +"Will generally raise NotImplementedError if executed on a 32bit OS.\n" "Restoring reflection for a key does not affect reflection of any\n" "subkeys."); @@ -1099,7 +1099,7 @@ PyDoc_STRVAR(winreg_QueryReflectionKey__doc__, " key\n" " An already open key, or any one of the predefined HKEY_* constants.\n" "\n" -"Will generally raise NotImplemented if executed on a 32bit OS."); +"Will generally raise NotImplementedError if executed on a 32bit OS."); #define WINREG_QUERYREFLECTIONKEY_METHODDEF \ {"QueryReflectionKey", (PyCFunction)winreg_QueryReflectionKey, METH_O, winreg_QueryReflectionKey__doc__}, @@ -1121,4 +1121,4 @@ winreg_QueryReflectionKey(PyObject *module, PyObject *arg) exit: return return_value; } -/*[clinic end generated code: output=1204d20c543b5b4a input=a9049054013a1b77]*/ +/*[clinic end generated code: output=015afbbd690eb59d input=a9049054013a1b77]*/ diff --git a/PC/winreg.c b/PC/winreg.c index 5f5fc85d2250..d0df7ef0ad47 100644 --- a/PC/winreg.c +++ b/PC/winreg.c @@ -1702,7 +1702,7 @@ winreg.DisableReflectionKey Disables registry reflection for 32bit processes running on a 64bit OS. -Will generally raise NotImplemented if executed on a 32bit OS. +Will generally raise NotImplementedError if executed on a 32bit OS. If the key is not on the reflection list, the function succeeds but has no effect. Disabling reflection for a key does not affect reflection @@ -1711,7 +1711,7 @@ of any subkeys. static PyObject * winreg_DisableReflectionKey_impl(PyObject *module, HKEY key) -/*[clinic end generated code: output=830cce504cc764b4 input=a6c9e5ca5410193c]*/ +/*[clinic end generated code: output=830cce504cc764b4 input=70bece2dee02e073]*/ { HMODULE hMod; typedef LONG (WINAPI *RDRKFunc)(HKEY); @@ -1749,14 +1749,14 @@ winreg.EnableReflectionKey Restores registry reflection for the specified disabled key. -Will generally raise NotImplemented if executed on a 32bit OS. +Will generally raise NotImplementedError if executed on a 32bit OS. Restoring reflection for a key does not affect reflection of any subkeys. [clinic start generated code]*/ static PyObject * winreg_EnableReflectionKey_impl(PyObject *module, HKEY key) -/*[clinic end generated code: output=86fa1385fdd9ce57 input=7748abbacd1e166a]*/ +/*[clinic end generated code: output=86fa1385fdd9ce57 input=eeae770c6eb9f559]*/ { HMODULE hMod; typedef LONG (WINAPI *RERKFunc)(HKEY); @@ -1794,12 +1794,12 @@ winreg.QueryReflectionKey Returns the reflection state for the specified key as a bool. -Will generally raise NotImplemented if executed on a 32bit OS. +Will generally raise NotImplementedError if executed on a 32bit OS. [clinic start generated code]*/ static PyObject * winreg_QueryReflectionKey_impl(PyObject *module, HKEY key) -/*[clinic end generated code: output=4e774af288c3ebb9 input=9f325eacb5a65d88]*/ +/*[clinic end generated code: output=4e774af288c3ebb9 input=a98fa51d55ade186]*/ { HMODULE hMod; typedef LONG (WINAPI *RQRKFunc)(HKEY, BOOL *);

1 0

bpo-37695: Correct unget_wch error message. (GH-14986)
by Miss Islington (bot) 31 Jul '19

31 Jul '19

https://github.com/python/cpython/commit/462f07040b39b778aa782d0f62050b7041… commit: 462f07040b39b778aa782d0f62050b70416dec7b branch: 3.8 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2019-07-31T13:44:59-07:00 summary: bpo-37695: Correct unget_wch error message. (GH-14986) (cherry picked from commit c9345e382c630ddcc2b148b30954640e0e435c8a) Co-authored-by: Anthony Sottile <asottile(a)umich.edu> files: A Misc/NEWS.d/next/Library/2019-07-27-20-21-03.bpo-37695.QANdvg.rst M Modules/_cursesmodule.c diff --git a/Misc/NEWS.d/next/Library/2019-07-27-20-21-03.bpo-37695.QANdvg.rst b/Misc/NEWS.d/next/Library/2019-07-27-20-21-03.bpo-37695.QANdvg.rst new file mode 100644 index 000000000000..ca6c11641ed6 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2019-07-27-20-21-03.bpo-37695.QANdvg.rst @@ -0,0 +1 @@ +Correct :func:`curses.unget_wch` error message. Patch by Anthony Sottile. diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c index 2435e1c12955..8fca7fcf1c18 100644 --- a/Modules/_cursesmodule.c +++ b/Modules/_cursesmodule.c @@ -4176,7 +4176,7 @@ PyCurses_ConvertToWchar_t(PyObject *obj, wchar_t buffer[2]; if (PyUnicode_AsWideChar(obj, buffer, 2) != 1) { PyErr_Format(PyExc_TypeError, - "expect bytes or str of length 1, or int, " + "expect str of length 1 or int, " "got a str of length %zi", PyUnicode_GET_LENGTH(obj)); return 0; @@ -4203,7 +4203,7 @@ PyCurses_ConvertToWchar_t(PyObject *obj, } else { PyErr_Format(PyExc_TypeError, - "expect bytes or str of length 1, or int, got %s", + "expect str of length 1 or int, got %s", Py_TYPE(obj)->tp_name); return 0; }

1 0

bpo-37695: Correct unget_wch error message. (GH-14986)
by Miss Islington (bot) 31 Jul '19

31 Jul '19

https://github.com/python/cpython/commit/35d9c37e271c35b87d64cc7422600e573f… commit: 35d9c37e271c35b87d64cc7422600e573f3ee244 branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2019-07-31T13:25:45-07:00 summary: bpo-37695: Correct unget_wch error message. (GH-14986) (cherry picked from commit c9345e382c630ddcc2b148b30954640e0e435c8a) Co-authored-by: Anthony Sottile <asottile(a)umich.edu> files: A Misc/NEWS.d/next/Library/2019-07-27-20-21-03.bpo-37695.QANdvg.rst M Modules/_cursesmodule.c diff --git a/Misc/NEWS.d/next/Library/2019-07-27-20-21-03.bpo-37695.QANdvg.rst b/Misc/NEWS.d/next/Library/2019-07-27-20-21-03.bpo-37695.QANdvg.rst new file mode 100644 index 000000000000..ca6c11641ed6 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2019-07-27-20-21-03.bpo-37695.QANdvg.rst @@ -0,0 +1 @@ +Correct :func:`curses.unget_wch` error message. Patch by Anthony Sottile. diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c index 931c5ceed062..45decf96a352 100644 --- a/Modules/_cursesmodule.c +++ b/Modules/_cursesmodule.c @@ -3120,7 +3120,7 @@ PyCurses_ConvertToWchar_t(PyObject *obj, wchar_t buffer[2]; if (PyUnicode_AsWideChar(obj, buffer, 2) != 1) { PyErr_Format(PyExc_TypeError, - "expect bytes or str of length 1, or int, " + "expect str of length 1 or int, " "got a str of length %zi", PyUnicode_GET_LENGTH(obj)); return 0; @@ -3147,7 +3147,7 @@ PyCurses_ConvertToWchar_t(PyObject *obj, } else { PyErr_Format(PyExc_TypeError, - "expect bytes or str of length 1, or int, got %s", + "expect str of length 1 or int, got %s", Py_TYPE(obj)->tp_name); return 0; }

1 0

bpo-37723: Fix performance regression on regular expression parsing. (GH-15030)
by Miss Islington (bot) 31 Jul '19

31 Jul '19

https://github.com/python/cpython/commit/33b700ba8cbb128519442eeed8c8747ff7… commit: 33b700ba8cbb128519442eeed8c8747ff73f4524 branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2019-07-31T13:22:19-07:00 summary: bpo-37723: Fix performance regression on regular expression parsing. (GH-15030) Improve performance of sre_parse._uniq function. (cherry picked from commit 9f55551f3df238e58315e724e50cb0d574d75b94) Co-authored-by: yannvgn <hi(a)yannvgn.io> files: A Misc/NEWS.d/next/Library/2019-07-31-16-49-01.bpo-37723.zq6tw8.rst M Lib/sre_parse.py M Misc/ACKS diff --git a/Lib/sre_parse.py b/Lib/sre_parse.py index a53735b07ded..cb2c4c3281c9 100644 --- a/Lib/sre_parse.py +++ b/Lib/sre_parse.py @@ -406,13 +406,7 @@ def _escape(source, escape, state): raise source.error("bad escape %s" % escape, len(escape)) def _uniq(items): - if len(set(items)) == len(items): - return items - newitems = [] - for item in items: - if item not in newitems: - newitems.append(item) - return newitems + return list(dict.fromkeys(items)) def _parse_sub(source, state, verbose, nested): # parse an alternation: a|b|c diff --git a/Misc/ACKS b/Misc/ACKS index 1b54d7ef7f18..29b6690f2174 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -1672,6 +1672,7 @@ Michael Urman Hector Urtubia Lukas Vacek Ville Vainio +Yann Vaginay Andi Vajda Case Van Horsen John Mark Vandenberg diff --git a/Misc/NEWS.d/next/Library/2019-07-31-16-49-01.bpo-37723.zq6tw8.rst b/Misc/NEWS.d/next/Library/2019-07-31-16-49-01.bpo-37723.zq6tw8.rst new file mode 100644 index 000000000000..65507bd0dc91 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2019-07-31-16-49-01.bpo-37723.zq6tw8.rst @@ -0,0 +1,2 @@ +Fix performance regression on regular expression parsing with huge +character sets. Patch by Yann Vaginay. \ No newline at end of file

1 0

bpo-37723: Fix performance regression on regular expression parsing. (GH-15030)
by Miss Islington (bot) 31 Jul '19

31 Jul '19

https://github.com/python/cpython/commit/77fcccb5321137456549b7f55b819f2c8a… commit: 77fcccb5321137456549b7f55b819f2c8a4c78a4 branch: 3.8 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2019-07-31T13:22:09-07:00 summary: bpo-37723: Fix performance regression on regular expression parsing. (GH-15030) Improve performance of sre_parse._uniq function. (cherry picked from commit 9f55551f3df238e58315e724e50cb0d574d75b94) Co-authored-by: yannvgn <hi(a)yannvgn.io> files: A Misc/NEWS.d/next/Library/2019-07-31-16-49-01.bpo-37723.zq6tw8.rst M Lib/sre_parse.py M Misc/ACKS diff --git a/Lib/sre_parse.py b/Lib/sre_parse.py index 84c912573e7f..83119168e637 100644 --- a/Lib/sre_parse.py +++ b/Lib/sre_parse.py @@ -430,13 +430,7 @@ def _escape(source, escape, state): raise source.error("bad escape %s" % escape, len(escape)) def _uniq(items): - if len(set(items)) == len(items): - return items - newitems = [] - for item in items: - if item not in newitems: - newitems.append(item) - return newitems + return list(dict.fromkeys(items)) def _parse_sub(source, state, verbose, nested): # parse an alternation: a|b|c diff --git a/Misc/ACKS b/Misc/ACKS index 829aa796c847..ad2e0a1996aa 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -1702,6 +1702,7 @@ Michael Urman Hector Urtubia Lukas Vacek Ville Vainio +Yann Vaginay Andi Vajda Case Van Horsen John Mark Vandenberg diff --git a/Misc/NEWS.d/next/Library/2019-07-31-16-49-01.bpo-37723.zq6tw8.rst b/Misc/NEWS.d/next/Library/2019-07-31-16-49-01.bpo-37723.zq6tw8.rst new file mode 100644 index 000000000000..65507bd0dc91 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2019-07-31-16-49-01.bpo-37723.zq6tw8.rst @@ -0,0 +1,2 @@ +Fix performance regression on regular expression parsing with huge +character sets. Patch by Yann Vaginay. \ No newline at end of file

1 0

bpo-37723: Fix performance regression on regular expression parsing. (GH-15030)
by Serhiy Storchaka 31 Jul '19

31 Jul '19

https://github.com/python/cpython/commit/9f55551f3df238e58315e724e50cb0d574… commit: 9f55551f3df238e58315e724e50cb0d574d75b94 branch: master author: yannvgn <hi(a)yannvgn.io> committer: Serhiy Storchaka <storchaka(a)gmail.com> date: 2019-07-31T21:50:39+03:00 summary: bpo-37723: Fix performance regression on regular expression parsing. (GH-15030) Improve performance of sre_parse._uniq function. files: A Misc/NEWS.d/next/Library/2019-07-31-16-49-01.bpo-37723.zq6tw8.rst M Lib/sre_parse.py M Misc/ACKS diff --git a/Lib/sre_parse.py b/Lib/sre_parse.py index 84c912573e7f..83119168e637 100644 --- a/Lib/sre_parse.py +++ b/Lib/sre_parse.py @@ -430,13 +430,7 @@ def _escape(source, escape, state): raise source.error("bad escape %s" % escape, len(escape)) def _uniq(items): - if len(set(items)) == len(items): - return items - newitems = [] - for item in items: - if item not in newitems: - newitems.append(item) - return newitems + return list(dict.fromkeys(items)) def _parse_sub(source, state, verbose, nested): # parse an alternation: a|b|c diff --git a/Misc/ACKS b/Misc/ACKS index 9ff74ec0cca1..6463b535e17c 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -1708,6 +1708,7 @@ Michael Urman Hector Urtubia Lukas Vacek Ville Vainio +Yann Vaginay Andi Vajda Case Van Horsen John Mark Vandenberg diff --git a/Misc/NEWS.d/next/Library/2019-07-31-16-49-01.bpo-37723.zq6tw8.rst b/Misc/NEWS.d/next/Library/2019-07-31-16-49-01.bpo-37723.zq6tw8.rst new file mode 100644 index 000000000000..65507bd0dc91 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2019-07-31-16-49-01.bpo-37723.zq6tw8.rst @@ -0,0 +1,2 @@ +Fix performance regression on regular expression parsing with huge +character sets. Patch by Yann Vaginay. \ No newline at end of file

1 0

bpo-34101: Add doc of PyBuffer_GetPointer (GH-14994)
by Miss Islington (bot) 31 Jul '19

31 Jul '19

https://github.com/python/cpython/commit/29a3a33d99dae0106c6af9d0fd75a11bef… commit: 29a3a33d99dae0106c6af9d0fd75a11bef26d15c branch: 3.8 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2019-07-31T08:04:31-07:00 summary: bpo-34101: Add doc of PyBuffer_GetPointer (GH-14994) (cherry picked from commit 1b29af83bc17e773b0c0d117f5fe1018fde46b0d) Co-authored-by: Hai Shi <shihai1992(a)gmail.com> files: M Doc/c-api/buffer.rst diff --git a/Doc/c-api/buffer.rst b/Doc/c-api/buffer.rst index 7553efc2cfbc..fdb8bd19d218 100644 --- a/Doc/c-api/buffer.rst +++ b/Doc/c-api/buffer.rst @@ -475,6 +475,12 @@ Buffer-related functions (*order* is ``'A'``). Return ``0`` otherwise. This function always succeeds. +.. c:function:: void* PyBuffer_GetPointer(Py_buffer *view, Py_ssize_t *indices) + + Get the memory area pointed to by the *indices* inside the given *view*. + *indices* must point to an array of ``view->ndim`` indices. + + .. c:function:: int PyBuffer_ToContiguous(void *buf, Py_buffer *src, Py_ssize_t len, char order) Copy *len* bytes from *src* to its contiguous representation in *buf*.

1 0

bpo-34101: Add doc of PyBuffer_GetPointer (GH-14994) (GH-15055)
by Antoine Pitrou 31 Jul '19

31 Jul '19

https://github.com/python/cpython/commit/353306137176985f1a2995ff964b0c00ec… commit: 353306137176985f1a2995ff964b0c00eccd1434 branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: Antoine Pitrou <antoine(a)python.org> date: 2019-07-31T16:57:09+02:00 summary: bpo-34101: Add doc of PyBuffer_GetPointer (GH-14994) (GH-15055) (cherry picked from commit 1b29af83bc17e773b0c0d117f5fe1018fde46b0d) Co-authored-by: Hai Shi <shihai1992(a)gmail.com> files: M Doc/c-api/buffer.rst diff --git a/Doc/c-api/buffer.rst b/Doc/c-api/buffer.rst index 1d4ac457e54c..71e5b32f1fe5 100644 --- a/Doc/c-api/buffer.rst +++ b/Doc/c-api/buffer.rst @@ -475,6 +475,12 @@ Buffer-related functions (*order* is ``'A'``). Return ``0`` otherwise. This function always succeeds. +.. c:function:: void* PyBuffer_GetPointer(Py_buffer *view, Py_ssize_t *indices) + + Get the memory area pointed to by the *indices* inside the given *view*. + *indices* must point to an array of ``view->ndim`` indices. + + .. c:function:: int PyBuffer_ToContiguous(void *buf, Py_buffer *src, Py_ssize_t len, char order) Copy *len* bytes from *src* to its contiguous representation in *buf*.

1 0

bpo-34101: Add doc of PyBuffer_GetPointer (GH-14994)
by Antoine Pitrou 31 Jul '19

31 Jul '19

https://github.com/python/cpython/commit/1b29af83bc17e773b0c0d117f5fe1018fd… commit: 1b29af83bc17e773b0c0d117f5fe1018fde46b0d branch: master author: Hai Shi <shihai1992(a)gmail.com> committer: Antoine Pitrou <antoine(a)python.org> date: 2019-07-31T16:48:15+02:00 summary: bpo-34101: Add doc of PyBuffer_GetPointer (GH-14994) files: M Doc/c-api/buffer.rst diff --git a/Doc/c-api/buffer.rst b/Doc/c-api/buffer.rst index 7553efc2cfbc..fdb8bd19d218 100644 --- a/Doc/c-api/buffer.rst +++ b/Doc/c-api/buffer.rst @@ -475,6 +475,12 @@ Buffer-related functions (*order* is ``'A'``). Return ``0`` otherwise. This function always succeeds. +.. c:function:: void* PyBuffer_GetPointer(Py_buffer *view, Py_ssize_t *indices) + + Get the memory area pointed to by the *indices* inside the given *view*. + *indices* must point to an array of ``view->ndim`` indices. + + .. c:function:: int PyBuffer_ToContiguous(void *buf, Py_buffer *src, Py_ssize_t len, char order) Copy *len* bytes from *src* to its contiguous representation in *buf*.

1 0

bpo-37695: Correct unget_wch error message. (GH-14986)
by Serhiy Storchaka 31 Jul '19

31 Jul '19

https://github.com/python/cpython/commit/c9345e382c630ddcc2b148b30954640e0e… commit: c9345e382c630ddcc2b148b30954640e0e435c8a branch: master author: Anthony Sottile <asottile(a)umich.edu> committer: Serhiy Storchaka <storchaka(a)gmail.com> date: 2019-07-31T15:11:24+03:00 summary: bpo-37695: Correct unget_wch error message. (GH-14986) files: A Misc/NEWS.d/next/Library/2019-07-27-20-21-03.bpo-37695.QANdvg.rst M Modules/_cursesmodule.c diff --git a/Misc/NEWS.d/next/Library/2019-07-27-20-21-03.bpo-37695.QANdvg.rst b/Misc/NEWS.d/next/Library/2019-07-27-20-21-03.bpo-37695.QANdvg.rst new file mode 100644 index 000000000000..ca6c11641ed6 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2019-07-27-20-21-03.bpo-37695.QANdvg.rst @@ -0,0 +1 @@ +Correct :func:`curses.unget_wch` error message. Patch by Anthony Sottile. diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c index 8595b6282c1b..dbe3c99d7d59 100644 --- a/Modules/_cursesmodule.c +++ b/Modules/_cursesmodule.c @@ -4176,7 +4176,7 @@ PyCurses_ConvertToWchar_t(PyObject *obj, wchar_t buffer[2]; if (PyUnicode_AsWideChar(obj, buffer, 2) != 1) { PyErr_Format(PyExc_TypeError, - "expect bytes or str of length 1, or int, " + "expect str of length 1 or int, " "got a str of length %zi", PyUnicode_GET_LENGTH(obj)); return 0; @@ -4203,7 +4203,7 @@ PyCurses_ConvertToWchar_t(PyObject *obj, } else { PyErr_Format(PyExc_TypeError, - "expect bytes or str of length 1, or int, got %s", + "expect str of length 1 or int, got %s", Py_TYPE(obj)->tp_name); return 0; }

1 0