traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Patch #683592 revisited, after discussions with MvL: 

- Implement the behavior as specified in PEP 277, meaning os.listdir()
  will only return unicode strings if it is _called_ with a unicode
  argument.
- And then return only unicode, don't attempt to convert to ASCII.
- Don't switch on Py_FileSystemDefaultEncoding, but simply use the
  default encoding if Py_FileSystemDefaultEncoding is NULL. This means
  os.listdir() can now raise UnicodeDecodeError if the default encoding
  can't represent the directory entry. (This seems better than silcencing
  the error and fall back to a byte string.)
- Attempted to decribe the above in Doc/lib/libos.tex.
- Reworded the Misc/NEWS items to reflect the current situation.

This checkin also fixes bug #696261, which was due to os.listdir() not
using Py_FileSystemDefaultEncoding, like all file system calls are
supposed to.
This commit is contained in:
Just van Rossum 2003-03-03 17:32:15 +00:00
parent ed6000a993
commit 96b1c903f5
3 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Doc/lib/libos.tex
View File

@ -711,8 +711,8 @@ entries \code{'.'} and \code{'..'} even if they are present in the
directory.
Availability: Macintosh, \UNIX, Windows.
\versionadded[On Windows NT/2k/XP, if \var{path} is a Unicode object,
the result will be a list of Unicode objects.]{2.3}
\versionadded[On Windows NT/2k/XP and Unix, if \var{path} is a Unicode
object, the result will be a list of Unicode objects.]{2.3}
\end{funcdesc}
\begin{funcdesc}{lstat}{path}

12
Misc/NEWS
View File

@ -41,11 +41,9 @@ Library
about the rationale is in the NEWS entry for that. See also SF bug
report <http://www.python.org/sf/693121>.
- os.listdir() now returns Unicode strings on platforms that set
Py_FileSystemDefaultEncoding, for file names that are not representable
in ASCII. (This currently only affects MacOS X; on Windows versions
with wide file name support os.listdir() already returned Unicode
strings.)
- On Unix platforms, if os.listdir() is called with a Unicode argument,
it now returns Unicode strings. (This behavior was added earlier
to the Windows NT/2k/XP version of os.listdir().)
- Distutils: both 'py_modules' and 'packages' keywords can now be specified
in core.setup(). Previously you could supply one or the other, but
@ -88,8 +86,8 @@ TBD
Mac
---
- os.listdir() now may return Unicode strings on MacOS X. See the general
news item under "Library".
- os.listdir() now returns Unicode strings on MacOS X when called with
a Unicode argument. See the general news item under "Library".
- A new method MacOS.WMAvailable() returns true if it is safe to access
the window manager, false otherwise.

18
Modules/posixmodule.c
View File

@ -1775,7 +1775,13 @@ posix_listdir(PyObject *self, PyObject *args)
PyObject *d, *v;
DIR *dirp;
struct dirent *ep;
if (!PyArg_ParseTuple(args, "s:listdir", &name))
int arg_is_unicode = 1;
if (!PyArg_ParseTuple(args, "U:listdir", &v)) {
arg_is_unicode = 0;
PyErr_Clear();
}
if (!PyArg_ParseTuple(args, "et:listdir", Py_FileSystemDefaultEncoding, &name))
return NULL;
if ((dirp = opendir(name)) == NULL) {
return posix_error_with_filename(name);
@ -1796,7 +1802,7 @@ posix_listdir(PyObject *self, PyObject *args)
break;
}
#ifdef Py_USING_UNICODE
if (Py_FileSystemDefaultEncoding != NULL) {
if (arg_is_unicode) {
PyObject *w;
w = PyUnicode_FromEncodedObject(v,
@ -1809,14 +1815,6 @@ posix_listdir(PyObject *self, PyObject *args)
d = NULL;
break;
}
/* attempt to convert to ASCII */
w = PyUnicode_AsASCIIString(v);
if (w != NULL) {
Py_DECREF(v);
v = w;
}
else
PyErr_Clear();
}
#endif
if (PyList_Append(d, v) != 0) {