Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

bpo-46210: Fix deadlock in print.#30310

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.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Open
notarealdeveloper wants to merge15 commits intopython:main
base:main
Choose a base branch
Loading
fromnotarealdeveloper:print
Open
Changes from1 commit
Commits
Show all changes
15 commits
Select commitHold shift + click to select a range
dc5d787
Fix deadlock in print.
notarealdeveloperDec 30, 2021
46d4ce6
Add Misc/NEWS.d entry.
notarealdeveloperDec 30, 2021
3409181
Only add _at_fork_reinit if fork is available.
notarealdeveloperDec 31, 2021
19f19b7
Use Py_RETURN_* in Modules/_io/bufferedio.c:buffered_at_fork_reinit
notarealdeveloperDec 31, 2021
f5334b4
Fix up reference counting in Python/pystate.c:stdio_at_fork_reinit
notarealdeveloperDec 31, 2021
3858006
Formatting for PEP 7.
notarealdeveloperJan 5, 2022
fb0bd16
Add _PySys_ReInitStdio to Python/sysmodule.c
notarealdeveloperJan 5, 2022
8c8d9c9
Call _PySys_ReInitStdio in PyOS_AfterFork_Child.
notarealdeveloperJan 5, 2022
a14bf74
Avoid adding a new python method.
notarealdeveloperJan 24, 2022
be40192
Add TestStdioAtForkReInit to test_thread.py
notarealdeveloperJan 24, 2022
bf9b398
Move INCREF in _PyIO_buffered_at_fork_reinit
notarealdeveloperFeb 7, 2022
5681a02
Remove unused variable in stdio_at_fork_reinit
notarealdeveloperFeb 7, 2022
2054bfa
Correct buffer->lock reinit logic.
notarealdeveloperFeb 8, 2022
a8e4185
Merge remote-tracking branch 'upstream/main' into print
notarealdeveloperFeb 17, 2022
56a405f
stream_at_fork_reinit now uses _Py_ID instead of _Py_Identifier.
notarealdeveloperFeb 17, 2022
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
PrevPrevious commit
NextNext commit
Merge remote-tracking branch 'upstream/main' into print
  • Loading branch information
@notarealdeveloper
notarealdeveloper committedFeb 17, 2022
commita8e41854c86412879f175caf9de11bc6df9b7c73
27 changes: 15 additions & 12 deletionsPython/sysmodule.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,18 +55,21 @@ module sys

#include "clinic/sysmodule.c.h"

_Py_IDENTIFIER(_);
_Py_IDENTIFIER(__sizeof__);
_Py_IDENTIFIER(_xoptions);
_Py_IDENTIFIER(buffer);
_Py_IDENTIFIER(builtins);
_Py_IDENTIFIER(encoding);
_Py_IDENTIFIER(path);
_Py_IDENTIFIER(stdin);
_Py_IDENTIFIER(stdout);
_Py_IDENTIFIER(stderr);
_Py_IDENTIFIER(warnoptions);
_Py_IDENTIFIER(write);
PyObject *
_PySys_GetAttr(PyThreadState *tstate, PyObject *name)
{
PyObject *sd = tstate->interp->sysdict;
if (sd == NULL) {
return NULL;
}
PyObject *exc_type, *exc_value, *exc_tb;
_PyErr_Fetch(tstate, &exc_type, &exc_value, &exc_tb);
/* XXX Suppress a new exception if it was raised and restore
* the old one. */
PyObject *value = _PyDict_GetItemWithError(sd, name);
_PyErr_Restore(tstate, exc_type, exc_value, exc_tb);
return value;
}

static PyObject *
sys_get_object_id(PyThreadState *tstate, _Py_Identifier *key)
Expand Down
You are viewing a condensed version of this merge commit. You can view thefull changes here.
[8]ページ先頭
©2009-2025 Movatter.jp