[Python-checkins] cpython (3.2): Correction to 88e318166eaf - Issue #11583
brian.curtin
python-checkins at python.org
Thu Jun 9 17:01:23 CEST 2011
http://hg.python.org/cpython/rev/d40609dd01e0
changeset: 70736:d40609dd01e0
branch: 3.2
parent: 70730:42cd9776017d
user: Brian Curtin <brian at python.org>
date: Thu Jun 09 09:10:38 2011 -0500
summary:
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.
files:
Lib/ntpath.py | 8 +++-----
Modules/posixmodule.c | 5 ++++-
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/Lib/ntpath.py b/Lib/ntpath.py
--- a/Lib/ntpath.py
+++ b/Lib/ntpath.py
@@ -679,9 +679,7 @@
# 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
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -2820,6 +2820,9 @@
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 @@
{"_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__},
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list