diff options
author | Victor Stinner <vstinner@redhat.com> | 2019-05-27 14:39:22 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-27 14:39:22 (GMT) |
commit | 331a6a56e9a9c72f3e4605987fabdaec72677702 (patch) | |
tree | 49d20cedd9df4371f2410b2fb24255535ca02c50 /PCbuild | |
parent | 8cd5165ba05ff57cfdbbc71c393bddad1ce1ab87 (diff) | |
download | cpython-331a6a56e9a9c72f3e4605987fabdaec72677702.zip cpython-331a6a56e9a9c72f3e4605987fabdaec72677702.tar.gz cpython-331a6a56e9a9c72f3e4605987fabdaec72677702.tar.bz2 |
bpo-36763: Implement the PEP 587 (GH-13592)
* Add a whole new documentation page:
"Python Initialization Configuration"
* PyWideStringList_Append() return type is now PyStatus,
instead of int
* PyInterpreterState_New() now calls PyConfig_Clear() if
PyConfig_InitPythonConfig() fails.
* Rename files:
* Python/coreconfig.c => Python/initconfig.c
* Include/cpython/coreconfig.h => Include/cpython/initconfig.h
* Include/internal/: pycore_coreconfig.h => pycore_initconfig.h
* Rename structures
* _PyCoreConfig => PyConfig
* _PyPreConfig => PyPreConfig
* _PyInitError => PyStatus
* _PyWstrList => PyWideStringList
* Rename PyConfig fields:
* use_module_search_paths => module_search_paths_set
* module_search_path_env => pythonpath_env
* Rename PyStatus field: _func => func
* PyInterpreterState: rename core_config field to config
* Rename macros and functions:
* _PyCoreConfig_SetArgv() => PyConfig_SetBytesArgv()
* _PyCoreConfig_SetWideArgv() => PyConfig_SetArgv()
* _PyCoreConfig_DecodeLocale() => PyConfig_SetBytesString()
* _PyInitError_Failed() => PyStatus_Exception()
* _Py_INIT_ERROR_TYPE_xxx enums => _PyStatus_TYPE_xxx
* _Py_UnixMain() => Py_BytesMain()
* _Py_ExitInitError() => Py_ExitStatusException()
* _Py_PreInitializeFromArgs() => Py_PreInitializeFromBytesArgs()
* _Py_PreInitializeFromWideArgs() => Py_PreInitializeFromArgs()
* _Py_PreInitialize() => Py_PreInitialize()
* _Py_RunMain() => Py_RunMain()
* _Py_InitializeFromConfig() => Py_InitializeFromConfig()
* _Py_INIT_XXX() => _PyStatus_XXX()
* _Py_INIT_FAILED() => _PyStatus_EXCEPTION()
* Rename 'err' PyStatus variables to 'status'
* Convert RUN_CODE() macro to config_run_code() static inline function
* Remove functions:
* _Py_InitializeFromArgs()
* _Py_InitializeFromWideArgs()
* _PyInterpreterState_GetCoreConfig()
Diffstat (limited to 'PCbuild')
-rw-r--r-- | PCbuild/pythoncore.vcxproj | 6 | ||||
-rw-r--r-- | PCbuild/pythoncore.vcxproj.filters | 18 |
2 files changed, 12 insertions, 12 deletions
diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj index db691cd..329f9fe 100644 --- a/PCbuild/pythoncore.vcxproj +++ b/PCbuild/pythoncore.vcxproj @@ -127,9 +127,9 @@ <ClInclude Include="..\Include\complexobject.h" /> <ClInclude Include="..\Include\context.h" /> <ClInclude Include="..\Include\cpython\abstract.h" /> - <ClInclude Include="..\Include\cpython\coreconfig.h" /> <ClInclude Include="..\Include\cpython\dictobject.h" /> <ClInclude Include="..\Include\cpython\fileobject.h" /> + <ClInclude Include="..\Include\cpython\initconfig.h" /> <ClInclude Include="..\Include\cpython\object.h" /> <ClInclude Include="..\Include\cpython\objimpl.h" /> <ClInclude Include="..\Include\cpython\pyerrors.h" /> @@ -161,11 +161,11 @@ <ClInclude Include="..\Include\internal\pycore_ceval.h" /> <ClInclude Include="..\Include\internal\pycore_condvar.h" /> <ClInclude Include="..\Include\internal\pycore_context.h" /> - <ClInclude Include="..\Include\internal\pycore_coreconfig.h" /> <ClInclude Include="..\Include\internal\pycore_fileutils.h" /> <ClInclude Include="..\Include\internal\pycore_getopt.h" /> <ClInclude Include="..\Include\internal\pycore_gil.h" /> <ClInclude Include="..\Include\internal\pycore_hamt.h" /> + <ClInclude Include="..\Include\internal\pycore_initconfig.h" /> <ClInclude Include="..\Include\internal\pycore_object.h" /> <ClInclude Include="..\Include\internal\pycore_pathconfig.h" /> <ClInclude Include="..\Include\internal\pycore_pyerrors.h" /> @@ -420,7 +420,6 @@ <ClCompile Include="..\Python\codecs.c" /> <ClCompile Include="..\Python\compile.c" /> <ClCompile Include="..\Python\context.c" /> - <ClCompile Include="..\Python\coreconfig.c" /> <ClCompile Include="..\Python\dynamic_annotations.c" /> <ClCompile Include="..\Python\dynload_win.c" /> <ClCompile Include="..\Python\errors.c" /> @@ -438,6 +437,7 @@ <ClCompile Include="..\Python\hamt.c" /> <ClCompile Include="..\Python\import.c" /> <ClCompile Include="..\Python\importdl.c" /> + <ClCompile Include="..\Python\initconfig.c" /> <ClCompile Include="..\Python\marshal.c" /> <ClCompile Include="..\Python\modsupport.c" /> <ClCompile Include="..\Python\mysnprintf.c" /> diff --git a/PCbuild/pythoncore.vcxproj.filters b/PCbuild/pythoncore.vcxproj.filters index dba47e9..d80d05f 100644 --- a/PCbuild/pythoncore.vcxproj.filters +++ b/PCbuild/pythoncore.vcxproj.filters @@ -84,15 +84,15 @@ <ClInclude Include="..\Include\cpython\abstract.h"> <Filter>Include</Filter> </ClInclude> - <ClInclude Include="..\Include\cpython\coreconfig.h"> - <Filter>Include</Filter> - </ClInclude> <ClInclude Include="..\Include\cpython\dictobject.h"> <Filter>Include</Filter> </ClInclude> <ClInclude Include="..\Include\cpython\fileobject.h"> <Filter>Include</Filter> </ClInclude> + <ClInclude Include="..\Include\cpython\initconfig.h"> + <Filter>Include</Filter> + </ClInclude> <ClInclude Include="..\Include\cpython\object.h"> <Filter>Include</Filter> </ClInclude> @@ -186,9 +186,6 @@ <ClInclude Include="..\Include\internal\pycore_context.h"> <Filter>Include</Filter> </ClInclude> - <ClInclude Include="..\Include\internal\pycore_coreconfig.h"> - <Filter>Include</Filter> - </ClInclude> <ClInclude Include="..\Include\internal\pycore_fileutils.h"> <Filter>Include</Filter> </ClInclude> @@ -201,6 +198,9 @@ <ClInclude Include="..\Include\internal\pycore_hamt.h"> <Filter>Include</Filter> </ClInclude> + <ClInclude Include="..\Include\internal\pycore_initconfig.h"> + <Filter>Include</Filter> + </ClInclude> <ClInclude Include="..\Include\internal\pycore_object.h"> <Filter>Include</Filter> </ClInclude> @@ -920,9 +920,6 @@ <ClCompile Include="..\Python\compile.c"> <Filter>Python</Filter> </ClCompile> - <ClCompile Include="..\Python\coreconfig.c"> - <Filter>Python</Filter> - </ClCompile> <ClCompile Include="..\Python\context.h"> <Filter>Python</Filter> </ClCompile> @@ -977,6 +974,9 @@ <ClCompile Include="..\Python\importdl.c"> <Filter>Python</Filter> </ClCompile> + <ClCompile Include="..\Python\initconfig.c"> + <Filter>Python</Filter> + </ClCompile> <ClCompile Include="..\Python\marshal.c"> <Filter>Python</Filter> </ClCompile> |