mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-22 01:35:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

import.c now catchs _Py_stat() exceptions

Browse source 
_Py_stat() now returns -2 if an exception was raised.
This commit is contained in:
Victor Stinner 2011-12-18 20:47:30 +01:00
parent 7bfe89945b
commit bd0850b857
3 changed files with 37 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Python/fileutils.c
View file

@ -240,8 +240,8 @@ _Py_wstat(const wchar_t* path, struct stat *buf)
/* Call _wstat() on Windows, or encode the path to the filesystem encoding and
call stat() otherwise. Only fill st_mode attribute on Windows.
Return 0 on success, -1 on _wstat() / stat() error or (if PyErr_Occurred())
unicode error. */
Return 0 on success, -1 on _wstat() / stat() error, -2 if an exception was
raised. */
int
_Py_stat(PyObject *path, struct stat *statbuf)
@ -253,7 +253,7 @@ _Py_stat(PyObject *path, struct stat *statbuf)
wpath = PyUnicode_AsUnicode(path);
if (wpath == NULL)
return -1;
return -2;
err = _wstat(wpath, &wstatbuf);
if (!err)
statbuf->st_mode = wstatbuf.st_mode;
@ -262,7 +262,7 @@ _Py_stat(PyObject *path, struct stat *statbuf)
int ret;
PyObject *bytes = PyUnicode_EncodeFSDefault(path);
if (bytes == NULL)
return -1;
return -2;
ret = stat(PyBytes_AS_STRING(bytes), statbuf);
Py_DECREF(bytes);
return ret;