Skip to content

gh-59616: Support os.chmod(follow_symlinks=True) and os.lchmod() on Windows #113049

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 14 commits into from
Dec 14, 2023
Merged

gh-59616: Support os.chmod(follow_symlinks=True) and os.lchmod() on Windows #113049

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
0d117a1
gh-59616: Support os.chmod(follow_symlinks=True) and os.lchmod() on W…
serhiy-storchaka Dec 13, 2023
a69e8cc
Fix tests on Windows.
serhiy-storchaka Dec 13, 2023
167c00d
Fix clinic.
serhiy-storchaka Dec 13, 2023
ac3ed22
Fix clinic and Windows again.
serhiy-storchaka Dec 13, 2023
62a69c9
Update docs.
serhiy-storchaka Dec 13, 2023
aebcd68
Run all tests.
serhiy-storchaka Dec 13, 2023
1f47f6a
What's New.
serhiy-storchaka Dec 13, 2023
3f3e25a
Revert auditing changes.
serhiy-storchaka Dec 13, 2023
5f5f826
Fix test_shutil on Windows.
serhiy-storchaka Dec 13, 2023
64883ac
Lie to Sphinx.
serhiy-storchaka Dec 13, 2023
37725be
Apply suggestions from code review
serhiy-storchaka Dec 14, 2023
b1b2914
Merge branch 'main' into win-chmod-follow-symlinks
serhiy-storchaka Dec 14, 2023
fbf0f88
Merge branch 'main' into win-chmod-follow-symlinks
serhiy-storchaka Dec 14, 2023
17b0faf
Add more warnings about the default value.
serhiy-storchaka Dec 14, 2023
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
Revert auditing changes.
  • Loading branch information
@serhiy-storchaka
serhiy-storchaka committed Dec 13, 2023
commit 3f3e25a8886346b858f502d06e9d65feabf3525c
6 changes: 3 additions & 3 deletions Doc/library/os.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -999,7 +999,7 @@ as internal buffering of data.
docs for :func:`chmod` for possible values of *mode*. As of Python 3.3, this
is equivalent to ``os.chmod(fd, mode)``.

.. audit-event:: os.chmod path,mode,dir_fd,follow_symlinks os.fchmod
.. audit-event:: os.chmod path,mode,dir_fd os.fchmod

.. availability:: Unix.

Expand Down Expand Up @@ -2067,7 +2067,7 @@ features:
The function is limited on Emscripten and WASI, see
:ref:`wasm-availability` for more information.

.. audit-event:: os.chmod path,mode,dir_fd,follow_symlinks os.chmod
.. audit-event:: os.chmod path,mode,dir_fd os.chmod

.. versionadded:: 3.3
Added support for specifying *path* as an open file descriptor,
Expand Down Expand Up @@ -2164,7 +2164,7 @@ features:
for possible values of *mode*. As of Python 3.3, this is equivalent to
``os.chmod(path, mode, follow_symlinks=False)``.

.. audit-event:: os.chmod path,mode,dir_fd,follow_symlinks os.lchmod
.. audit-event:: os.chmod path,mode,dir_fd os.lchmod

.. availability:: Unix, Windows.

Expand Down
9 changes: 4 additions & 5 deletions Modules/posixmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3384,9 +3384,8 @@ os_chmod_impl(PyObject *module, path_t *path, int mode, int dir_fd,
return NULL;
#endif

if (PySys_Audit("os.chmod", "OiiO", path->object, mode,
dir_fd == DEFAULT_DIR_FD ? -1 : dir_fd,
follow_symlinks ? Py_True : Py_False) < 0) {
if (PySys_Audit("os.chmod", "Oii", path->object, mode,
dir_fd == DEFAULT_DIR_FD ? -1 : dir_fd) < 0) {
return NULL;
}

Expand Down Expand Up @@ -3531,7 +3530,7 @@ os_fchmod_impl(PyObject *module, int fd, int mode)
int res;
int async_err = 0;

if (PySys_Audit("os.chmod", "iiiO", fd, mode, -1, Py_False) < 0) {
if (PySys_Audit("os.chmod", "iii", fd, mode, -1) < 0) {
return NULL;
}

Expand Down Expand Up @@ -3566,7 +3565,7 @@ os_lchmod_impl(PyObject *module, path_t *path, int mode)
/*[clinic end generated code: output=082344022b51a1d5 input=90c5663c7465d24f]*/
{
int res;
if (PySys_Audit("os.chmod", "OiiO", path->object, mode, -1, Py_False) < 0) {
if (PySys_Audit("os.chmod", "Oii", path->object, mode, -1) < 0) {
return NULL;
}
#ifdef MS_WINDOWS
Expand Down