diff options
| -rw-r--r-- | Misc/NEWS.d/next/Library/2018-09-07-10-16-34.bpo-34604.xL7-kG.rst | 3 | ||||
| -rw-r--r-- | Modules/grpmodule.c | 2 | ||||
| -rw-r--r-- | Modules/pwdmodule.c | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/Misc/NEWS.d/next/Library/2018-09-07-10-16-34.bpo-34604.xL7-kG.rst b/Misc/NEWS.d/next/Library/2018-09-07-10-16-34.bpo-34604.xL7-kG.rst index 562a691..958b74f 100644 --- a/Misc/NEWS.d/next/Library/2018-09-07-10-16-34.bpo-34604.xL7-kG.rst +++ b/Misc/NEWS.d/next/Library/2018-09-07-10-16-34.bpo-34604.xL7-kG.rst @@ -1,2 +1,3 @@ Fix possible mojibake in the error message of `pwd.getpwnam` and -`grp.getgrnam`. Patch by William Grzybowski. +`grp.getgrnam` using string representation because of invisible characters +or trailing whitespaces. Patch by William Grzybowski. diff --git a/Modules/grpmodule.c b/Modules/grpmodule.c index d426f08..ab766b9 100644 --- a/Modules/grpmodule.c +++ b/Modules/grpmodule.c @@ -247,7 +247,7 @@ grp_getgrnam_impl(PyObject *module, PyObject *name) PyErr_NoMemory(); } else { - PyErr_Format(PyExc_KeyError, "getgrnam(): name not found: %S", name); + PyErr_Format(PyExc_KeyError, "getgrnam(): name not found: %R", name); } goto out; } diff --git a/Modules/pwdmodule.c b/Modules/pwdmodule.c index fd11f84..e0232b8 100644 --- a/Modules/pwdmodule.c +++ b/Modules/pwdmodule.c @@ -257,7 +257,7 @@ pwd_getpwnam_impl(PyObject *module, PyObject *name) } else { PyErr_Format(PyExc_KeyError, - "getpwnam(): name not found: %S", name); + "getpwnam(): name not found: %R", name); } goto out; } |