Skip to content

Commit e31766a

Browse files
committed
Fix trailing spaces
1 parent 277ebc1 commit e31766a

2 files changed

Lines changed: 11 additions & 11 deletions

File tree

Lib/test/test_os/test_os.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2338,7 +2338,7 @@ class PROCESS_INFORMATION(ctypes.Structure):
23382338
import os
23392339
import shutil
23402340
import tempfile
2341-
2341+
23422342
# Test what was reported in gh-134587
23432343
target = tempfile.mkdtemp(prefix='_test_ac_inner_')
23442344
try:

Modules/posixmodule.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6143,11 +6143,11 @@ os__path_normpath_impl(PyObject *module, path_t *path)
61436143
#if defined(MS_WINDOWS) && \
61446144
(defined(MS_WINDOWS_APP) || defined(MS_WINDOWS_SYSTEM))
61456145

6146-
// If running under an AppContainer, this will append an ACE to the provided
6146+
// If running under an AppContainer, this will append an ACE to the provided
61476147
// SDDL string that grants full control to the AppContainer SID.
61486148
static LPCWSTR
61496149
sddl_append_for_appcontainer_if_necessary(LPCWSTR base_sddl) {
6150-
6150+
61516151
// Default to using the "base" SDDL, which is what we want if
61526152
// we are not running under an AppContainer
61536153
LPCWSTR resolved_sddl = base_sddl;
@@ -6184,7 +6184,7 @@ sddl_append_for_appcontainer_if_necessary(LPCWSTR base_sddl) {
61846184
}
61856185

61866186
// Get the AppContainer SID
6187-
getTokenResult = GetTokenInformation(hToken, TokenAppContainerSid,
6187+
getTokenResult = GetTokenInformation(hToken, TokenAppContainerSid,
61886188
tokenInfo, returnLength, &returnLength);
61896189
if (!getTokenResult) {
61906190
goto done;
@@ -6200,28 +6200,28 @@ sddl_append_for_appcontainer_if_necessary(LPCWSTR base_sddl) {
62006200
}
62016201

62026202
// Now that we know we are running under an AppContainer, and we have
6203-
// the AppContainer SID as a string, we can append an ACE to the provided
6203+
// the AppContainer SID as a string, we can append an ACE to the provided
62046204
// SDDL
62056205

6206-
// Dynamically allocate the final buffer here. This is expected to be
6207-
// called at most once, however in the case it could be called from
6208-
// multiple threads, we are dynamically allocating the buffer here rather
6209-
// than using a static buffer (which would then require synchronization
6206+
// Dynamically allocate the final buffer here. This is expected to be
6207+
// called at most once, however in the case it could be called from
6208+
// multiple threads, we are dynamically allocating the buffer here rather
6209+
// than using a static buffer (which would then require synchronization
62106210
// for that static buffer).
62116211
LPWSTR sddl_buf = PyMem_RawMalloc(sizeof(WCHAR) * 256);
62126212

62136213
int sddl_chars = _snwprintf(
62146214
sddl_buf,
62156215
256,
6216-
// Append a string that includes inheritable (OICI) entries
6216+
// Append a string that includes inheritable (OICI) entries
62176217
// that allow (A) full control (FA) to the AppContainer SID
62186218
L"%s(A;OICI;FA;;;%s)",
62196219
base_sddl,
62206220
sidStr);
62216221

62226222
if (sddl_chars >= 0 && (size_t)sddl_chars < 256) {
62236223
resolved_sddl = sddl_buf;
6224-
}
6224+
}
62256225
else {
62266226
PyMem_RawFree(sddl_buf);
62276227
}

0 commit comments

Comments
 (0)