commit 7a633ed79cfba2cfc0f80410ddcaeecadc2030e9
author William Grzybowski <wg@FreeBSD.org> Sun Sep 09 08:27:31 2018 -0300
committer Victor Stinner <vstinner@redhat.com> Sun Sep 09 13:27:31 2018 +0200
tree e2eaa34c94f6b2831613a58ac85678f23aeb9bba
parent 77b92b15a5e5c84b91d3fd9d02f63db432fa8903

[3.7] bpo-34604: Fix possible mojibake in pwd.getpwnam() and grp.getgrnam() (GH-9098) (GH-9104)

Pass the user/group name as Unicode to the formatting function,
instead of always decoding a bytes string from UTF-8..
(cherry picked from commit 28658485a54ad5f9df52ecc12d9046269f1654ec)

Co-authored-by: William Grzybowski <wg@FreeBSD.org>

Modules/pwdmodule.c

diff --git a/Modules/pwdmodule.c b/Modules/pwdmodule.c
index bbef2de..21c2b54 100644
--- a/Modules/pwdmodule.c
+++ b/Modules/pwdmodule.c
@@ -163,7 +163,7 @@
         goto out;
     if ((p = getpwnam(name)) == NULL) {
         PyErr_Format(PyExc_KeyError,
-                     "getpwnam(): name not found: %s", name);
+                     "getpwnam(): name not found: %S", arg);
         goto out;
     }
     retval = mkpwent(p);