mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-01 18:51:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 21

Merge 3.2

Browse source
This commit is contained in:
Brian Curtin 2011-06-09 09:46:21 -05:00
commit d9463b233c
2 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/ntpath.py
View file

@ -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

5
Modules/posixmodule.c
View file

@ -2961,6 +2961,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)
{
@ -9597,7 +9600,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__},