mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-04 16:43:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Undo last commit. It's causing the tests to file.

Browse source
This commit is contained in:
Neil Schemenauer 2002-03-22 23:50:30 +00:00
parent c155dd4ca9
commit 12a6d942d8
1 changed files with 0 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Objects/fileobject.c
View file

@ -56,32 +56,6 @@ PyFile_Name(PyObject *f)
return ((PyFileObject *)f)->f_name; return ((PyFileObject *)f)->f_name;
} }
/* On Unix, fopen will succeed for directories.
In Python, there should be no file objects referring to
directories, so we need a check. */
static PyFileObject*
dircheck(PyFileObject* f)
{
#if defined(HAVE_FSTAT) && defined(S_IFDIR) && defined(EISDIR)
struct stat buf;
if (f->f_fp == NULL)
return f;
if (fstat(fileno(f->f_fp), &buf) == 0 &&
S_ISDIR(buf.st_mode)) {
#ifdef HAVE_STRERROR
char *msg = strerror(EISDIR);
#else
char *msg = "Is a directory";
#endif
PyObject *exc = PyObject_CallFunction(PyExc_IOError, "(is)", EISDIR, msg);
PyErr_SetObject(PyExc_IOError, exc);
return NULL;
}
#endif
return f;
}
static PyObject * static PyObject *
fill_file_fields(PyFileObject *f, FILE *fp, char *name, char *mode, fill_file_fields(PyFileObject *f, FILE *fp, char *name, char *mode,
@ -103,7 +77,6 @@ fill_file_fields(PyFileObject *f, FILE *fp, char *name, char *mode,
if (f->f_name == NULL || f->f_mode == NULL) if (f->f_name == NULL || f->f_mode == NULL)
return NULL; return NULL;
f->f_fp = fp; f->f_fp = fp;
f = dircheck(f);
return (PyObject *) f; return (PyObject *) f;
} }
@ -157,7 +130,6 @@ open_the_file(PyFileObject *f, char *name, char *mode)
PyErr_SetFromErrnoWithFilename(PyExc_IOError, name); PyErr_SetFromErrnoWithFilename(PyExc_IOError, name);
f = NULL; f = NULL;
} }
f = dircheck(f);
return (PyObject *)f; return (PyObject *)f;
} }