combined patches from http://bugs.python.org/issue3187

Modules/posixmodule.c

 
 /* POSIX module implementation */
 
 /* This file is also used for Windows NT/MS-Win and OS/2.  In that case the
    module actually calls itself 'nt' or 'os2', not 'posix', and a few
    functions are either unimplemented or implemented differently.  The source
    assumes that for Windows NT, the macro 'MS_WINDOWS' is defined independent
    of the compiler used.  Different compilers define their own feature
    test macro, e.g. '__BORLANDC__' or '_MSC_VER'.  For OS/2, the compiler
    independent macro PYOS_OS2 should be defined.  On OS/2 the default
@@ skipping 2336 matching lines @@
                 if (arg_is_unicode) {
                         PyObject *w;
 
                         w = PyUnicode_FromEncodedObject(v,
                                         Py_FileSystemDefaultEncoding,
                                         "strict");
                         if (w != NULL) {
                                 Py_DECREF(v);
                                 v = w;
                         }
                         else {

[GvR, 2008/09/30 18:10:41]

I'd like to see a comment here, e.g.

/* Ignore undecodable filenames, as discussed in issue 3187.
   To include these, use getcwdb(). */

+                                /* Ignore undecodable filenames, as discussed
+                                 * in issue 3187. To include these,
+                                 * use getcwdb(). */
                                 PyErr_Clear();
                                 Py_DECREF(v);
                                 continue;
                         }
                 }
                 if (PyList_Append(d, v) != 0) {
                         Py_DECREF(v);
                         Py_DECREF(d);
                         d = NULL;
                         break;
@@ skipping 2079 matching lines @@
                 PyObject *w;
 
                 w = PyUnicode_FromEncodedObject(v,
                                 Py_FileSystemDefaultEncoding,
                                 "strict");
                 if (w != NULL) {
                         Py_DECREF(v);
                         v = w;
                 }
                 else {
-                        /* fall back to the original byte string, as
-                           discussed in patch #683592 */
-                        PyErr_Clear();
+                        v = NULL;
                 }
         }
         return v;
 }
 #endif /* HAVE_READLINK */
 
 
 #ifdef HAVE_SYMLINK
 PyDoc_STRVAR(posix_symlink__doc__,
 "symlink(src, dst)\n\n\
@@ skipping 2968 matching lines @@
 
 
 #endif /* __APPLE__ */
         return m;
 
 }
 
 #ifdef __cplusplus
 }
 #endif