Correction to 88e318166eaf - Issue #11583

Rather than wrapping the C _isdir function in a Python function,
just import the C _isdir function directly. Additionally, add in the
docstring which was left out.
This commit is contained in:
Brian Curtin 2011-06-09 09:10:38 -05:00
parent ebc991c0ce
commit 95d028fd18
2 changed files with 7 additions and 6 deletions

View file

@ -679,9 +679,7 @@ def sameopenfile(f1, f2):
# attribute to tell whether or not the path is a directory.
# This is overkill on Windows - just pass the path to GetFileAttributes
# and check the attribute from there.
from nt import _isdir
from nt import _isdir as isdir
except ImportError:
from genericpath import isdir as _isdir
def isdir(path):
return _isdir(path)
# Use genericpath.isdir as imported above.
pass

View file

@ -2820,6 +2820,9 @@ posix__getfileinformation(PyObject *self, PyObject *args)
info.nFileIndexLow);
}
PyDoc_STRVAR(posix__isdir__doc__,
"Return true if the pathname refers to an existing directory.");
static PyObject *
posix__isdir(PyObject *self, PyObject *args)
{
@ -8091,7 +8094,7 @@ static PyMethodDef posix_methods[] = {
{"_getfullpathname", posix__getfullpathname, METH_VARARGS, NULL},
{"_getfinalpathname", posix__getfinalpathname, METH_VARARGS, NULL},
{"_getfileinformation", posix__getfileinformation, METH_VARARGS, NULL},
{"_isdir", posix__isdir, METH_VARARGS, NULL},
{"_isdir", posix__isdir, METH_VARARGS, posix__isdir__doc__},
#endif
#ifdef HAVE_GETLOADAVG
{"getloadavg", posix_getloadavg, METH_NOARGS, posix_getloadavg__doc__},