bpo-34604: Use %R because of invisible characters or trailing whitespaces. (GH-9165). (GH-10947) (GH-10954)

miss-islington · william-gr · serhiy-storchaka · commit 3a9b3346b037 · 2018-12-06T00:04:19.000+02:00
(cherry picked from commit 34c7f0c) (cherry picked from commit ac8b47c) Co-authored-by: William Grzybowski <wg@FreeBSD.org>
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
@@ -0,0 +1,3 @@
+Fix possible mojibake in the error message of `pwd.getpwnam` and
+`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
@@ -156,7 +156,7 @@ grp_getgrnam_impl(PyObject *module, PyObject *name)
         goto out;
 
     if ((p = getgrnam(name_chars)) == NULL) {
-        PyErr_Format(PyExc_KeyError, "getgrnam(): name not found: %S", name);
+        PyErr_Format(PyExc_KeyError, "getgrnam(): name not found: %R", name);
         goto out;
     }
     retval = mkgrent(p);
diff --git a/Modules/pwdmodule.c b/Modules/pwdmodule.c
@@ -163,7 +163,7 @@ pwd_getpwnam_impl(PyObject *module, PyObject *arg)
         goto out;
     if ((p = getpwnam(name)) == NULL) {
         PyErr_Format(PyExc_KeyError,
-                     "getpwnam(): name not found: %S", arg);
+                     "getpwnam(): name not found: %R", arg);
         goto out;
     }
     retval = mkpwent(p);

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+Fix possible mojibake in the error message of `pwd.getpwnam` and
	`2`	+`grp.getgrnam` using string representation because of invisible characters
	`3`	`+or trailing whitespaces. Patch by William Grzybowski.`
Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ grp_getgrnam_impl(PyObject module, PyObject name)`
`156`	`156`	`goto out;`
`157`	`157`
`158`	`158`	`if ((p = getgrnam(name_chars)) == NULL) {`
`159`		`- PyErr_Format(PyExc_KeyError, "getgrnam(): name not found: %S", name);`
	`159`	`+ PyErr_Format(PyExc_KeyError, "getgrnam(): name not found: %R", name);`
`160`	`160`	`goto out;`
`161`	`161`	`}`
`162`	`162`	`retval = mkgrent(p);`
Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ pwd_getpwnam_impl(PyObject module, PyObject arg)`
`163`	`163`	`goto out;`
`164`	`164`	`if ((p = getpwnam(name)) == NULL) {`
`165`	`165`	`PyErr_Format(PyExc_KeyError,`
`166`		`- "getpwnam(): name not found: %S", arg);`
	`166`	`+ "getpwnam(): name not found: %R", arg);`
`167`	`167`	`goto out;`
`168`	`168`	`}`
`169`	`169`	`retval = mkpwent(p);`