Skip to content

Commit 0e5bed9

Browse files
committed
swap from ?: to PyErr_Occurred
1 parent 409b9a9 commit 0e5bed9

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

Modules/_io/bufferedio.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ _enter_buffered_busy(buffered *self)
362362
}
363363

364364
#define IS_CLOSED(self) \
365-
(!self->buffer ? !self->buffer : \
365+
(!self->buffer || \
366366
(self->fast_closed_checks \
367367
? _PyFileIO_closed(self->raw) \
368368
: buffered_closed(self)))
@@ -555,10 +555,9 @@ _io__Buffered_close_impl(buffered *self)
555555
}
556556
/* gh-138720: Use IS_CLOSED to match flush CHECK_CLOSED. */
557557
r = IS_CLOSED(self);
558-
if (r < 0)
559-
goto end;
560558
if (r > 0) {
561-
res = Py_NewRef(Py_None);
559+
if (!PyErr_Occurred())
560+
res = Py_NewRef(Py_None);
562561
goto end;
563562
}
564563

0 commit comments

Comments
 (0)