Skip to content

gh-155496: Use Argument Clinic for the getpath module #158132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
serhiy-storchaka merged 3 commits into from
Sep 27, 2026
Merged

gh-155496: Use Argument Clinic for the getpath module #158132

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f30fd64
gh-155496: Use Argument Clinic for the getpath module
serhiy-storchaka Aug 22, 2026
c7a7b19
gh-155496: Use the Py_UNICODE converter in the getpath module
serhiy-storchaka Sep 26, 2026
eb6990c
gh-155496: Use the bool return converter in the getpath module
serhiy-storchaka Sep 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
gh-155496: Use the Py_UNICODE converter in the getpath module 
Argument Clinic now converts the path argument of abspath(), isabs() and
isdir() to a wide character string, and isabs() and isdir() use the bool
return converter.
  • Loading branch information
@serhiy-storchaka
serhiy-storchaka committed Sep 26, 2026
commit c7a7b19039f9018a5c98d109715ad5bba9960016
58 changes: 43 additions & 15 deletions Modules/clinic/getpath.c.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

71 changes: 25 additions & 46 deletions Modules/getpath.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,30 +70,23 @@ module getpath
/*[clinic input]
getpath.abspath

path as pathobj: unicode
path: Py_UNICODE
/

Return the absolute path.
[clinic start generated code]*/

static PyObject *
getpath_abspath_impl(PyObject *module, PyObject *pathobj)
/*[clinic end generated code: output=a307fc0d5d82eb2e input=2f8179427a1a31a6]*/
getpath_abspath_impl(PyObject *module, const wchar_t *path)
/*[clinic end generated code: output=5009336e32e75b9b input=0fd554ce535744f2]*/
{
PyObject *r = NULL;
wchar_t *path;
Py_ssize_t len;
path = PyUnicode_AsWideCharString(pathobj, &len);
if (path) {
wchar_t *abs;
if (_Py_abspath((const wchar_t *)_Py_normpath(path, -1), &abs) == 0 && abs) {
r = PyUnicode_FromWideChar(abs, -1);
PyMem_RawFree((void *)abs);
} else {
PyErr_SetString(PyExc_OSError, "failed to make path absolute");
}
PyMem_Free((void *)path);
wchar_t *abs;
if (_Py_abspath(_Py_normpath((wchar_t *)path, -1), &abs) < 0 || abs == NULL) {
PyErr_SetString(PyExc_OSError, "failed to make path absolute");
return NULL;
}
PyObject *r = PyUnicode_FromWideChar(abs, -1);
PyMem_RawFree((void *)abs);
return r;
}

Expand Down Expand Up @@ -143,26 +136,19 @@ getpath_dirname_impl(PyObject *module, PyObject *path)


/*[clinic input]
getpath.isabs
getpath.isabs -> bool

path as pathobj: unicode
path: Py_UNICODE
/

Return True if the path is absolute.
[clinic start generated code]*/

static PyObject *
getpath_isabs_impl(PyObject *module, PyObject *pathobj)
/*[clinic end generated code: output=7f5c62037d0b2c86 input=e49d90a186348140]*/
static int
getpath_isabs_impl(PyObject *module, const wchar_t *path)
/*[clinic end generated code: output=4659b9e6f088c2ca input=04931a206cdd77f6]*/
{
PyObject *r = NULL;
const wchar_t *path;
path = PyUnicode_AsWideCharString(pathobj, NULL);
if (path) {
r = _Py_isabs(path) ? Py_True : Py_False;
PyMem_Free((void *)path);
}
return Py_XNewRef(r);
return _Py_isabs(path);
}


Expand Down Expand Up @@ -209,33 +195,26 @@ getpath_hassuffix_impl(PyObject *module, PyObject *pathobj,


/*[clinic input]
getpath.isdir
getpath.isdir -> bool

path as pathobj: unicode
path: Py_UNICODE
/

Return True if the path is a directory.
[clinic start generated code]*/

static PyObject *
getpath_isdir_impl(PyObject *module, PyObject *pathobj)
/*[clinic end generated code: output=5af217f29e968e1b input=d1d4c4d74d2e37f1]*/
static int
getpath_isdir_impl(PyObject *module, const wchar_t *path)
/*[clinic end generated code: output=467820dd83daa7a6 input=0ddd588cd5357a9a]*/
{
PyObject *r = NULL;
const wchar_t *path;
path = PyUnicode_AsWideCharString(pathobj, NULL);
if (path) {
#ifdef MS_WINDOWS
DWORD attr = GetFileAttributesW(path);
r = (attr != INVALID_FILE_ATTRIBUTES) &&
(attr & FILE_ATTRIBUTE_DIRECTORY) ? Py_True : Py_False;
DWORD attr = GetFileAttributesW(path);
return (attr != INVALID_FILE_ATTRIBUTES)
&& (attr & FILE_ATTRIBUTE_DIRECTORY);
#else
struct stat st;
r = (_Py_wstat(path, &st) == 0) && S_ISDIR(st.st_mode) ? Py_True : Py_False;
struct stat st;
return (_Py_wstat(path, &st) == 0) && S_ISDIR(st.st_mode);
#endif
PyMem_Free((void *)path);
}
return Py_XNewRef(r);
}


Expand Down
Loading