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-34523: Use _PyCoreConfig instead of globals#9005

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

Merged
vstinner merged 1 commit intopython:masterfromvstinner:use_config
Aug 29, 2018
Merged
Show file tree
Hide file tree
Changes fromall commits
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
bpo-34523: Use _PyCoreConfig instead of globals
Get configuratiom the core configuration of the interpreter, ratherthan getting global configuration variables. For example, replacePy_QuietFlag with core_config->quiet.
  • Loading branch information
@vstinner
vstinner committedAug 29, 2018
commit748aa6a1e140084d7a02579935dc612eca115ac0
2 changes: 1 addition & 1 deletionInclude/pylifecycle.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -123,7 +123,7 @@ PyAPI_FUNC(const char *) _Py_gitversion(void);
#ifndef Py_LIMITED_API
PyAPI_FUNC(PyObject *) _PyBuiltin_Init(void);
PyAPI_FUNC(_PyInitError) _PySys_BeginInit(PyObject **sysmod);
PyAPI_FUNC(int) _PySys_EndInit(PyObject *sysdict,_PyMainInterpreterConfig *config);
PyAPI_FUNC(int) _PySys_EndInit(PyObject *sysdict,PyInterpreterState *interp);
PyAPI_FUNC(_PyInitError) _PyImport_Init(PyInterpreterState *interp);
PyAPI_FUNC(void) _PyExc_Init(PyObject * bltinmod);
PyAPI_FUNC(_PyInitError) _PyImportHooks_Init(void);
Expand Down
8 changes: 6 additions & 2 deletionsInclude/pystate.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -249,7 +249,9 @@ PyAPI_FUNC(void) PyInterpreterState_Delete(PyInterpreterState *);
PyAPI_FUNC(PyInterpreterState *) _PyInterpreterState_Get(void);
#endif
#ifdef Py_BUILD_CORE
/* Macro which should only be used for performance critical code */
/* Macro which should only be used for performance critical code.
Need "#include "internal/pystate.h". See also _PyInterpreterState_Get()
and _PyGILState_GetInterpreterStateUnsafe(). */
# define _PyInterpreterState_GET_UNSAFE() (PyThreadState_GET()->interp)
#endif
#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03070000
Expand DownExpand Up@@ -369,7 +371,9 @@ PyAPI_FUNC(int) PyGILState_Check(void);
GILState implementation.

Return NULL before _PyGILState_Init() is called and after _PyGILState_Fini()
is called. */
is called.

See also _PyInterpreterState_Get() and _PyInterpreterState_GET_UNSAFE(). */
PyAPI_FUNC(PyInterpreterState *) _PyGILState_GetInterpreterStateUnsafe(void);
#endif /* !Py_LIMITED_API */

Expand Down
18 changes: 9 additions & 9 deletionsModules/main.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -951,18 +951,18 @@ pymain_init_stdio(_PyMain *pymain, _PyCoreConfig *config)


static void
pymain_header(_PyMain *pymain)
pymain_header(_PyMain *pymain, const _PyCoreConfig *config)
{
if (Py_QuietFlag) {
if (config->quiet) {
return;
}

if (!Py_VerboseFlag && (RUN_CODE(pymain) || !pymain->stdin_is_interactive)) {
if (!config->verbose && (RUN_CODE(pymain) || !pymain->stdin_is_interactive)) {
return;
}

fprintf(stderr, "Python %s on %s\n", Py_GetVersion(), Py_GetPlatform());
if (!Py_NoSiteFlag) {
if (config->site_import) {
fprintf(stderr, "%s\n", COPYRIGHT);
}
}
Expand DownExpand Up@@ -1041,12 +1041,12 @@ wstrlist_as_pylist(int len, wchar_t **list)


static void
pymain_import_readline(_PyMain *pymain)
pymain_import_readline(_PyMain *pymain, const _PyCoreConfig *config)
{
if (Py_IsolatedFlag) {
if (config->isolated) {
return;
}
if (!Py_InspectFlag && RUN_CODE(pymain)) {
if (!config->inspect && RUN_CODE(pymain)) {
return;
}
if (!isatty(fileno(stdin))) {
Expand DownExpand Up@@ -1591,8 +1591,8 @@ pymain_run_python(_PyMain *pymain, PyInterpreterState *interp)

PyCompilerFlags cf = {.cf_flags = 0};

pymain_header(pymain);
pymain_import_readline(pymain);
pymain_header(pymain, config);
pymain_import_readline(pymain, config);

if (pymain->command) {
pymain->status = pymain_run_command(pymain->command, &cf);
Expand Down
5 changes: 4 additions & 1 deletionPython/bltinmodule.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@

#include "Python.h"
#include "Python-ast.h"
#include "internal/pystate.h"

#include "node.h"
#include "code.h"
Expand DownExpand Up@@ -2765,6 +2766,8 @@ _PyBuiltin_Init(void)
{
PyObject *mod, *dict, *debug;

const _PyCoreConfig *config = &_PyInterpreterState_GET_UNSAFE()->core_config;

if (PyType_Ready(&PyFilter_Type) < 0 ||
PyType_Ready(&PyMap_Type) < 0 ||
PyType_Ready(&PyZip_Type) < 0)
Expand DownExpand Up@@ -2823,7 +2826,7 @@ _PyBuiltin_Init(void)
SETBUILTIN("tuple", &PyTuple_Type);
SETBUILTIN("type", &PyType_Type);
SETBUILTIN("zip", &PyZip_Type);
debug = PyBool_FromLong(Py_OptimizeFlag == 0);
debug = PyBool_FromLong(config->optimization_level == 0);
if (PyDict_SetItemString(dict, "__debug__", debug) < 0) {
Py_DECREF(debug);
return NULL;
Expand Down
19 changes: 10 additions & 9 deletionsPython/pylifecycle.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -800,7 +800,7 @@ _Py_InitializeMainInterpreter(PyInterpreterState *interp,
return _Py_INIT_ERR("can't initialize time");
}

if (_PySys_EndInit(interp->sysdict,&interp->config) < 0) {
if (_PySys_EndInit(interp->sysdict, interp) < 0) {
return _Py_INIT_ERR("can't finish initializing sys");
}

Expand DownExpand Up@@ -1285,7 +1285,7 @@ new_interpreter(PyThreadState **tstate_p)
goto handle_error;
Py_INCREF(interp->sysdict);
PyDict_SetItemString(interp->sysdict, "modules", modules);
_PySys_EndInit(interp->sysdict,&interp->config);
_PySys_EndInit(interp->sysdict, interp);
}

bimod = _PyImport_FindBuiltin("builtins", modules);
Expand DownExpand Up@@ -1543,7 +1543,7 @@ is_valid_fd(int fd)

/* returns Py_None if the fd is not valid */
static PyObject*
create_stdio(PyObject* io,
create_stdio(const _PyCoreConfig *config,PyObject* io,
int fd, int write_mode, const char* name,
const char* encoding, const char* errors)
{
Expand All@@ -1556,6 +1556,7 @@ create_stdio(PyObject* io,
_Py_IDENTIFIER(isatty);
_Py_IDENTIFIER(TextIOWrapper);
_Py_IDENTIFIER(mode);
const int buffered_stdio = config->buffered_stdio;

if (!is_valid_fd(fd))
Py_RETURN_NONE;
Expand All@@ -1565,7 +1566,7 @@ create_stdio(PyObject* io,
depends on the presence of a read1() method which only exists on
buffered streams.
*/
if (Py_UnbufferedStdioFlag && write_mode)
if (!buffered_stdio && write_mode)
buffering = 0;
else
buffering = -1;
Expand DownExpand Up@@ -1607,11 +1608,11 @@ create_stdio(PyObject* io,
Py_DECREF(res);
if (isatty == -1)
goto error;
if (Py_UnbufferedStdioFlag)
if (!buffered_stdio)
write_through = Py_True;
else
write_through = Py_False;
if (isatty &&!Py_UnbufferedStdioFlag)
if (isatty &&buffered_stdio)
line_buffering = Py_True;
else
line_buffering = Py_False;
Expand DownExpand Up@@ -1720,7 +1721,7 @@ init_sys_streams(PyInterpreterState *interp)
* and fileno() may point to an invalid file descriptor. For example
* GUI apps don't have valid standard streams by default.
*/
std = create_stdio(iomod, fd, 0, "<stdin>",
std = create_stdio(config,iomod, fd, 0, "<stdin>",
config->stdio_encoding,
config->stdio_errors);
if (std == NULL)
Expand All@@ -1731,7 +1732,7 @@ init_sys_streams(PyInterpreterState *interp)

/* Set sys.stdout */
fd = fileno(stdout);
std = create_stdio(iomod, fd, 1, "<stdout>",
std = create_stdio(config,iomod, fd, 1, "<stdout>",
config->stdio_encoding,
config->stdio_errors);
if (std == NULL)
Expand All@@ -1743,7 +1744,7 @@ init_sys_streams(PyInterpreterState *interp)
#if 1 /* Disable this if you have trouble debugging bootstrap stuff */
/* Set sys.stderr, replaces the preliminary stderr */
fd = fileno(stderr);
std = create_stdio(iomod, fd, 1, "<stderr>",
std = create_stdio(config,iomod, fd, 1, "<stderr>",
config->stdio_encoding,
"backslashreplace");
if (std == NULL)
Expand Down
38 changes: 20 additions & 18 deletionsPython/sysmodule.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2076,7 +2076,7 @@ make_flags(void)
{
int pos = 0;
PyObject *seq;
_PyCoreConfig *core_config = &_PyGILState_GetInterpreterStateUnsafe()->core_config;
const_PyCoreConfig *config = &_PyInterpreterState_GET_UNSAFE()->core_config;

seq = PyStructSequence_New(&FlagsType);
if (seq == NULL)
Expand All@@ -2085,23 +2085,23 @@ make_flags(void)
#define SetFlag(flag) \
PyStructSequence_SET_ITEM(seq, pos++, PyLong_FromLong(flag))

SetFlag(Py_DebugFlag);
SetFlag(Py_InspectFlag);
SetFlag(Py_InteractiveFlag);
SetFlag(Py_OptimizeFlag);
SetFlag(Py_DontWriteBytecodeFlag);
SetFlag(Py_NoUserSiteDirectory);
SetFlag(Py_NoSiteFlag);
SetFlag(Py_IgnoreEnvironmentFlag);
SetFlag(Py_VerboseFlag);
SetFlag(config->parser_debug);
SetFlag(config->inspect);
SetFlag(config->interactive);
SetFlag(config->optimization_level);
SetFlag(!config->write_bytecode);
SetFlag(!config->user_site_directory);
SetFlag(!config->site_import);
SetFlag(!config->use_environment);
SetFlag(config->verbose);
/* SetFlag(saw_unbuffered_flag); */
/* SetFlag(skipfirstline); */
SetFlag(Py_BytesWarningFlag);
SetFlag(Py_QuietFlag);
SetFlag(Py_HashRandomizationFlag);
SetFlag(Py_IsolatedFlag);
PyStructSequence_SET_ITEM(seq, pos++, PyBool_FromLong(core_config->dev_mode));
SetFlag(Py_UTF8Mode);
SetFlag(config->bytes_warning);
SetFlag(config->quiet);
SetFlag(config->use_hash_seed == 0 || config->hash_seed != 0);
SetFlag(config->isolated);
PyStructSequence_SET_ITEM(seq, pos++, PyBool_FromLong(config->dev_mode));
SetFlag(config->utf8_mode);
#undef SetFlag

if (PyErr_Occurred()) {
Expand DownExpand Up@@ -2474,8 +2474,10 @@ _PySys_BeginInit(PyObject **sysmod)
} while (0)

int
_PySys_EndInit(PyObject *sysdict,_PyMainInterpreterConfig *config)
_PySys_EndInit(PyObject *sysdict,PyInterpreterState *interp)
{
const _PyCoreConfig *core_config = &interp->core_config;
const _PyMainInterpreterConfig *config = &interp->config;
int res;

/* _PyMainInterpreterConfig_Read() must set all these variables */
Expand DownExpand Up@@ -2523,7 +2525,7 @@ _PySys_EndInit(PyObject *sysdict, _PyMainInterpreterConfig *config)
}

SET_SYS_FROM_STRING_INT_RESULT("dont_write_bytecode",
PyBool_FromLong(Py_DontWriteBytecodeFlag));
PyBool_FromLong(!core_config->write_bytecode));

if (get_warnoptions() == NULL)
return -1;
Expand Down
[8]ページ先頭
©2009-2025 Movatter.jp