Make pwd, spwd and grp modules decode string fields using the
file system encoding and the "surrogateescape" error handler, as
per PEP 383.

Index: Modules/pwdmodule.c
===================================================================
--- Modules/pwdmodule.c.orig
+++ Modules/pwdmodule.c
@@ -49,8 +49,9 @@
 sets(PyObject *v, int i, const char* val)
 {
   if (val) {
-	  PyObject *o =
-		PyUnicode_DecodeUnicodeEscape(val, strlen(val), "strict");
+	  PyObject *o = PyUnicode_Decode(val, strlen(val),
+					 Py_FileSystemDefaultEncoding,
+					 "surrogateescape");
 	  PyStructSequence_SET_ITEM(v, i, o);
   }
   else {
Index: Modules/spwdmodule.c
===================================================================
--- Modules/spwdmodule.c.orig
+++ Modules/spwdmodule.c
@@ -59,9 +59,12 @@
 static void
 sets(PyObject *v, int i, const char* val)
 {
-  if (val)
-	  PyStructSequence_SET_ITEM(v, i, PyUnicode_FromString(val));
-  else {
+  if (val) {
+	  PyObject *o = PyUnicode_Decode(val, strlen(val),
+					 Py_FileSystemDefaultEncoding,
+					 "surrogateescape");
+	  PyStructSequence_SET_ITEM(v, i, o);
+  } else {
 	  PyStructSequence_SET_ITEM(v, i, Py_None);
 	  Py_INCREF(Py_None);
   }
Index: Modules/grpmodule.c
===================================================================
--- Modules/grpmodule.c.orig
+++ Modules/grpmodule.c
@@ -46,8 +46,11 @@
         Py_DECREF(v);
         return NULL;
     }
+#define FSDECODE(val) PyUnicode_Decode(val, strlen(val),\
+                                       Py_FileSystemDefaultEncoding,\
+                                       "surrogateescape")
     for (member = p->gr_mem; *member != NULL; member++) {
-        PyObject *x = PyUnicode_FromString(*member);
+        PyObject *x = FSDECODE(*member);
         if (x == NULL || PyList_Append(w, x) != 0) {
             Py_XDECREF(x);
             Py_DECREF(w);
@@ -58,13 +61,13 @@
     }
 
 #define SET(i,val) PyStructSequence_SET_ITEM(v, i, val)
-    SET(setIndex++, PyUnicode_FromString(p->gr_name));
+    SET(setIndex++, FSDECODE(p->gr_name));
 #ifdef __VMS
     SET(setIndex++, Py_None);
     Py_INCREF(Py_None);
 #else
     if (p->gr_passwd)
-	    SET(setIndex++, PyUnicode_FromString(p->gr_passwd));
+	    SET(setIndex++, FSDECODE(p->gr_passwd));
     else {
 	    SET(setIndex++, Py_None);
 	    Py_INCREF(Py_None);