mirror of
https://github.com/python/cpython
synced 2024-10-15 05:53:14 +00:00
gh-109782: Ensure os.path.isdir
has the same signature on all platforms (GH-109790)
This commit is contained in:
parent
3814bc1723
commit
7df8b16d28
|
@ -0,0 +1,2 @@
|
|||
Ensure the signature of :func:`os.path.isdir` is identical on all platforms.
|
||||
Patch by Amin Alaee.
|
16
Modules/clinic/posixmodule.c.h
generated
16
Modules/clinic/posixmodule.c.h
generated
|
@ -1977,7 +1977,7 @@ exit:
|
|||
#if defined(MS_WINDOWS)
|
||||
|
||||
PyDoc_STRVAR(os__path_isdir__doc__,
|
||||
"_path_isdir($module, /, path)\n"
|
||||
"_path_isdir($module, /, s)\n"
|
||||
"--\n"
|
||||
"\n"
|
||||
"Return true if the pathname refers to an existing directory.");
|
||||
|
@ -1986,7 +1986,7 @@ PyDoc_STRVAR(os__path_isdir__doc__,
|
|||
{"_path_isdir", _PyCFunction_CAST(os__path_isdir), METH_FASTCALL|METH_KEYWORDS, os__path_isdir__doc__},
|
||||
|
||||
static PyObject *
|
||||
os__path_isdir_impl(PyObject *module, PyObject *path);
|
||||
os__path_isdir_impl(PyObject *module, PyObject *s);
|
||||
|
||||
static PyObject *
|
||||
os__path_isdir(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
|
||||
|
@ -2001,7 +2001,7 @@ os__path_isdir(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObje
|
|||
PyObject *ob_item[NUM_KEYWORDS];
|
||||
} _kwtuple = {
|
||||
.ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS)
|
||||
.ob_item = { &_Py_ID(path), },
|
||||
.ob_item = { &_Py_ID(s), },
|
||||
};
|
||||
#undef NUM_KEYWORDS
|
||||
#define KWTUPLE (&_kwtuple.ob_base.ob_base)
|
||||
|
@ -2010,7 +2010,7 @@ os__path_isdir(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObje
|
|||
# define KWTUPLE NULL
|
||||
#endif // !Py_BUILD_CORE
|
||||
|
||||
static const char * const _keywords[] = {"path", NULL};
|
||||
static const char * const _keywords[] = {"s", NULL};
|
||||
static _PyArg_Parser _parser = {
|
||||
.keywords = _keywords,
|
||||
.fname = "_path_isdir",
|
||||
|
@ -2018,14 +2018,14 @@ os__path_isdir(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObje
|
|||
};
|
||||
#undef KWTUPLE
|
||||
PyObject *argsbuf[1];
|
||||
PyObject *path;
|
||||
PyObject *s;
|
||||
|
||||
args = _PyArg_UnpackKeywords(args, nargs, NULL, kwnames, &_parser, 1, 1, 0, argsbuf);
|
||||
if (!args) {
|
||||
goto exit;
|
||||
}
|
||||
path = args[0];
|
||||
return_value = os__path_isdir_impl(module, path);
|
||||
s = args[0];
|
||||
return_value = os__path_isdir_impl(module, s);
|
||||
|
||||
exit:
|
||||
return return_value;
|
||||
|
@ -11988,4 +11988,4 @@ exit:
|
|||
#ifndef OS_WAITSTATUS_TO_EXITCODE_METHODDEF
|
||||
#define OS_WAITSTATUS_TO_EXITCODE_METHODDEF
|
||||
#endif /* !defined(OS_WAITSTATUS_TO_EXITCODE_METHODDEF) */
|
||||
/*[clinic end generated code: output=1dd5aa7495cd6e3a input=a9049054013a1b77]*/
|
||||
/*[clinic end generated code: output=51aa26bc6a41e1da input=a9049054013a1b77]*/
|
||||
|
|
|
@ -4912,25 +4912,25 @@ os__path_splitroot_impl(PyObject *module, path_t *path)
|
|||
/*[clinic input]
|
||||
os._path_isdir
|
||||
|
||||
path: 'O'
|
||||
s: 'O'
|
||||
|
||||
Return true if the pathname refers to an existing directory.
|
||||
|
||||
[clinic start generated code]*/
|
||||
|
||||
static PyObject *
|
||||
os__path_isdir_impl(PyObject *module, PyObject *path)
|
||||
/*[clinic end generated code: output=00faea0af309669d input=b1d2571cf7291aaf]*/
|
||||
os__path_isdir_impl(PyObject *module, PyObject *s)
|
||||
/*[clinic end generated code: output=9d87ab3c8b8a4e61 input=c17f7ef21d22d64e]*/
|
||||
{
|
||||
HANDLE hfile;
|
||||
BOOL close_file = TRUE;
|
||||
FILE_BASIC_INFO info;
|
||||
path_t _path = PATH_T_INITIALIZE("isdir", "path", 0, 1);
|
||||
path_t _path = PATH_T_INITIALIZE("isdir", "s", 0, 1);
|
||||
int result;
|
||||
BOOL slow_path = TRUE;
|
||||
FILE_STAT_BASIC_INFORMATION statInfo;
|
||||
|
||||
if (!path_converter(path, &_path)) {
|
||||
if (!path_converter(s, &_path)) {
|
||||
path_cleanup(&_path);
|
||||
if (PyErr_ExceptionMatches(PyExc_ValueError)) {
|
||||
PyErr_Clear();
|
||||
|
|
Loading…
Reference in a new issue