summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Lib/ntpath.py8
-rw-r--r--Modules/posixmodule.c5
2 files changed, 7 insertions, 6 deletions
diff --git a/Lib/ntpath.py b/Lib/ntpath.py
index 2483ced..826be87 100644
--- a/Lib/ntpath.py
+++ b/Lib/ntpath.py
@@ -679,9 +679,7 @@ try:
# 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
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index 767ed61..eb2e412 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -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__},