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

william-gr · serhiy-storchaka · commit 34c7f0c04e2b · 2018-12-05T21:10:18.000+02:00
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
@@ -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
@@ -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
@@ -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;
     }

Original file line number	Diff line number	Diff line change
`@@ -247,7 +247,7 @@ grp_getgrnam_impl(PyObject module, PyObject name)`
`247`	`247`	`PyErr_NoMemory();`
`248`	`248`	`}`
`249`	`249`	`else {`
`250`		`- PyErr_Format(PyExc_KeyError, "getgrnam(): name not found: %S", name);`
	`250`	`+ PyErr_Format(PyExc_KeyError, "getgrnam(): name not found: %R", name);`
`251`	`251`	`}`
`252`	`252`	`goto out;`
`253`	`253`	`}`
Original file line number	Diff line number	Diff line change
`@@ -257,7 +257,7 @@ pwd_getpwnam_impl(PyObject module, PyObject name)`
`257`	`257`	`}`
`258`	`258`	`else {`
`259`	`259`	`PyErr_Format(PyExc_KeyError,`
`260`		`- "getpwnam(): name not found: %S", name);`
	`260`	`+ "getpwnam(): name not found: %R", name);`
`261`	`261`	`}`
`262`	`262`	`goto out;`
`263`	`263`	`}`