8000 PEP7 · python/cpython@19018dc · GitHub
[go: up one dir, main page]
Skip to content

Commit 19018dc

Browse files
mdboommdboom
committed
PEP7
1 parent 0d2985d commit 19018dc

File tree

1 file changed

+53
-25
lines changed

1 file changed

+53
-25
lines changed

‎Modules/posixmodule.c

Lines changed: 53 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -14992,7 +14992,8 @@ os__isdir_impl(PyObject *module, PyObject *path)
1499214992
if (PyErr_ExceptionMatches(PyExc_ValueError)) {
1499314993
PyErr_Clear();
1499414994
Py_RETURN_FALSE;
14995-
} else {
14995+
}
14996+
else {
1499614997
return NULL;
1499714998
}
1499814999
}
@@ -15001,20 +15002,25 @@ os__isdir_impl(PyObject *module, PyObject *path)
1500115002
if (_path.fd != -1) {
1500215003
hfile = _Py_get_osfhandle_noraise(_path.fd);
1500315004
close_file = FALSE;
15004-
} else {
15005+
}
15006+
else {
1500515007
hfile = CreateFileW(_path.wide, FILE_READ_ATTRIBUTES, 0, NULL,
1500615008
OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL);
1500715009
}
1500815010
if (hfile != INVALID_HANDLE_VALUE) {
15009-
if (GetFileInformationByHandleEx(hfile, FileBasicInfo, &info, sizeof(info))) {
15011+
if (GetFileInformationByHandleEx(hfile, FileBasicInfo, &info,
15012+
sizeof(info)))
15013+
{
1501015014
result = info.FileAttributes & FILE_ATTRIBUTE_DIRECTORY;
15011-
} else {
15015+
}
15016+
else {
1501215017
result = 0;
1501315018
}
1501415019
if (close_file) {
1501515020
CloseHandle(hfile);
1501615021
}
15017-
} else {
15022+
}
15023+
else {
1501815024
error = GetLastError();
1501915025
switch (error) {
1502015026
case ERROR_ACCESS_DENIED:
@@ -15023,7 +15029,8 @@ os__isdir_impl(PyObject *module, PyObject *path)
1502315029
case ERROR_INVALID_PARAMETER:
1502415030
if (STAT(_path.wide, &st)) {
1502515031
result = 0;
15026-
} else {
15032+
}
15033+
else {
1502715034
result = S_ISDIR(st.st_mode);
1502815035
}
1502915036
break;
@@ -15036,7 +15043,8 @@ os__isdir_impl(PyObject *module, PyObject *path)
1503615043
path_cleanup(&_path);
1503715044
if (result) {
1503815045
Py_RETURN_TRUE;
15039-
} else {
15046+
}
15047+
else {
1504015048
Py_RETURN_FALSE;
1504115049
}
1504215050
}
@@ -15071,7 +15079,8 @@ os__isfile_impl(PyObject *module, PyObject *path)
1507115079
if (PyErr_ExceptionMatches(PyExc_ValueError)) {
1507215080
PyErr_Clear();
1507315081
Py_RETURN_FALSE;
15074-
} else {
15082+
}
15083+
else {
1507515084
return NULL;
1507615085
}
1507715086
}
@@ -15080,20 +15089,25 @@ os__isfile_impl(PyObject *module, PyObject *path)
1508015089
if (_path.fd != -1) {
1508115090
hfile = _Py_get_osfhandle_noraise(_path.fd);
1508215091
close_file = FALSE;
15083-
} else {
15092+
}
15093+
else {
1508415094
hfile = CreateFileW(_path.wide, FILE_READ_ATTRIBUTES, 0, NULL,
1508515095
OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL);
1508615096
}
1508715097
if (hfile != INVALID_HANDLE_VALUE) {
15088-
if (GetFileInformationByHandleEx(hfile, FileBasicInfo, &info, sizeof(info))) {
15098+
if (GetFileInformationByHandleEx(hfile, FileBasicInfo, &info,
15099+
sizeof(info)))
15100+
{
1508915101
result = !(info.FileAttributes & FILE_ATTRIBUTE_DIRECTORY);
15090-
} else {
15102+
}
15103+
else {
1509115104
result = 0;
1509215105
}
1509315106
if (close_file) {
1509415107
CloseHandle(hfile);
1509515108
}
15096-
} else {
15109+
}
15110+
else {
1509715111
error = GetLastError();
1509815112
switch (error) {
1509915113
case ERROR_ACCESS_DENIED:
@@ -15102,7 +15116,8 @@ os__isfile_impl(PyObject *module, PyObject *path)
1510215116
case ERROR_INVALID_PARAMETER:
1510315117
if (STAT(_path.wide, &st)) {
1510415118
result = 0;
15105-
} else {
15119+
}
15120+
else {
1510615121
result = S_ISREG(st.st_mode);
1510715122
}
1510815123
break;
@@ -15115,7 +15130,8 @@ os__isfile_impl(PyObject *module, PyObject *path)
1511515130
path_cleanup(&_path);
1511615131
if (result) {
1511715132
Py_RETURN_TRUE;
15118-
} else {
15133+
}
15134+
else {
1511915135
Py_RETURN_FALSE;
1512015136
}
1512115137
}
@@ -15150,7 +15166,8 @@ os__exists_impl(PyObject *module, PyObject *path)
1515015166
if (PyErr_ExceptionMatches(PyExc_ValueError)) {
1515115167
PyErr_Clear();
1515215168
Py_RETURN_FALSE;
15153-
} else {
15169+
}
15170+
else {
1515415171
return NULL;
1515515172
}
1515615173
}
@@ -15159,7 +15176,8 @@ os__exists_impl(PyObject *module, PyObject *path)
1515915176
if (_path.fd != -1) {
1516015177
hfile = _Py_get_osfhandle_noraise(_path.fd);
1516115178
close_file = FALSE;
15162-
} else {
15179+
}
15180+
else {
1516315181
hfile = CreateFileW(_path.wide, FILE_READ_ATTRIBUTES, 0, NULL,
1516415182
OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL);
1516515183
}
@@ -15168,7 +15186,8 @@ os__exists_impl(PyObject *module, PyObject *path)
1516815186
if (close_file) {
1516915187
CloseHandle(hfile);
1517015188
}
15171-
} else {
15189+
}
15190+
else {
1517215191
error = GetLastError();
1517315192
switch (error) {
1517415193
case ERROR_ACCESS_DENIED:
@@ -15190,7 +15209,8 @@ os__exists_impl(PyObject *module, PyObject *path)
1519015209
path_cleanup(&_path);
1519115210
if (result) {
1519215211
Py_RETURN_TRUE;
15193-
} else {
15212+
}
15213+
else {
1519415214
Py_RETURN_FALSE;
1519515215
}
1519615216
}
@@ -15224,7 +15244,8 @@ os__islink_impl(PyObject *module, PyObject *path)
1522415244
if (PyErr_ExceptionMatches(PyExc_ValueError)) {
1522515245
PyErr_Clear();
1522615246
Py_RETURN_FALSE;
15227-
} else {
15247+
}
15248+
else {
1522815249
return NULL;
1522915250
}
1523015251
}
@@ -15233,22 +15254,27 @@ os__islink_impl(PyObject *module, PyObject *path)
1523315254
if (_path.fd != -1) {
1523415255
hfile = _Py_get_osfhandle_noraise(_path.fd);
1523515256
close_file = FALSE;
15236-
} else {
15257+
}
15258+
else {
1523715259
hfile = CreateFileW(_path.wide, FILE_READ_ATTRIBUTES, 0, NULL,
1523815260
OPEN_EXISTING,
1523915261
FILE_FLAG_OPEN_REPARSE_POINT | FILE_FLAG_BACKUP_SEMANTICS,
1524015262
NULL);
1524115263
}
1524215264
if (hfile != INVALID_HANDLE_VALUE) {
15243-
if (GetFileInformationByHandleEx(hfile, FileAttributeTagInfo, &info, sizeof(info))) {
15265+
if (GetFileInformationByHandleEx(hfile, FileAttributeTagInfo, &info,
15266+
sizeof(info)))
15267+
{
1524415268
result = (info.ReparseTag == IO_REPARSE_TAG_SYMLINK);
15245-
} else {
15269+
}
15270+
else {
1524615271
result = 0;
1524715272
}
1524815273
if (close_file) {
1524915274
CloseHandle(hfile);
1525015275
}
15251-
} else {
15276+
}
15277+
else {
1525215278
error = GetLastError();
1525315279
switch (error) {
1525415280
case ERROR_ACCESS_DENIED:
@@ -15257,7 +15283,8 @@ os__islink_impl(PyObject *module, PyObject *path)
1525715283
case ERROR_INVALID_PARAMETER:
1525815284
if (LSTAT(_path.wide, &st)) {
1525915285
result = 0;
15260-
} else {
15286+
}
15287+
else {
1526115288
result = S_ISLNK(st.st_mode);
1526215289
}
1526315290
break;
@@ -15270,7 +15297,8 @@ os__islink_impl(PyObject *module, PyObject *path)
1527015297
path_cleanup(&_path);
1527115298
if (result) {
1527215299
Py_RETURN_TRUE;
15273-
} else {
15300+
}
15301+
else {
1527415302
Py_RETURN_FALSE;
1527515303
}
1527615304
}

0 commit comments

Comments
 (0)
0