Skip to content
Merged
Changes from 1 commit
Commits
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
Do not mask errors in _channel_recv().
  • Loading branch information
ericsnowcurrently committed May 16, 2018
commit bffbbfce0031b524a5ded6fa956db381dcb6c37e
4 changes: 3 additions & 1 deletion Modules/_xxsubinterpretersmodule.c
Original file line number Diff line number Diff line change
Expand Up @@ -1250,7 +1250,9 @@ _channel_recv(_channels *channels, int64_t id)
_PyCrossInterpreterData *data = _channel_next(chan, interp->id);
PyThread_release_lock(mutex);
if (data == NULL) {
PyErr_Format(ChannelEmptyError, "channel %d is empty", id);
if (!PyErr_Occurred()) {
PyErr_Format(ChannelEmptyError, "channel %d is empty", id);
}
return NULL;
}

Expand Down