Skip to content
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 our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bpo-32030: Add _PyCoreConfig.warn_opts #4936

Merged
merged 1 commit into from
Dec 20, 2017
Merged

bpo-32030: Add _PyCoreConfig.warn_opts #4936

merged 1 commit into from
Dec 20, 2017

Conversation

vstinner
Copy link
Member

@vstinner vstinner commented Dec 20, 2017

  • Add nxoption, xoptions, nwarn_opt and warn_opts to _PyCoreConfig
  • Move filename, command and module from _Py_CommandLineDetails to
    _PyMain
  • Remove xoptions from _Py_CommandLineDetails
  • Add pymain_cmdline() function
  • Add _PyMain.program: argv[0] or ""
  • Rename copy_argv() to copy_wstrlist()
  • Rename clear_argv() to clear_wstrlist()
  • Rename pymain_set_flag_from_env() to pymain_get_env_flag()
  • Rename pymain_set_flags_from_env() to pymain_get_env_flags()
  • _PyMainInterpreterConfig_Read() now creates the warnoptions from
    _PyCoreConfig.warnoptions

_Py_CommandLineDetails usage is now restricted to pymain_cmdline().

https://bugs.python.org/issue32030

Merge _PyCoreConfig_ReadEnv() into _PyCoreConfig_Read(), and
_Py_CommandLineDetails usage is now restricted to pymain_cmdline().

Changes:

* _PyCoreConfig: Add nxoption, xoptions, nwarnoption and warnoptions
* Add _PyCoreConfig.program: argv[0] or ""
* Move filename, command, module and xoptions from
  _Py_CommandLineDetails to _PyMain. xoptions _Py_OptList becomes
  (int, wchar_t**) list.
* Add pymain_cmdline() function
* Rename copy_argv() to copy_wstrlist(). Rename clear_argv() to
  clear_wstrlist(). Remove _Py_OptList structure: use (int,
  wchar_t**) list instead.
* Rename pymain_set_flag_from_env() to pymain_get_env_flag()
* Rename pymain_set_flags_from_env() to pymain_get_env_flags()
* _PyMainInterpreterConfig_Read() now creates the warnoptions from
  _PyCoreConfig.warnoptions
* Inline pymain_add_warning_dev_mode() and
  pymain_add_warning_bytes_flag() into config_init_warnoptions()
* Inline pymain_get_program_name() into _PyCoreConfig_Read()
* _Py_CommandLineDetails: Replace warning_options with nwarnoption
  and warnoptions. Replace env_warning_options with nenv_warnoption
  and env_warnoptions.
* pymain_warnings_envvar() now has a single implementation for
  Windows and Unix: use config_get_env_var_dup() to also get the
  variable as wchar_t* on Unix.
@vstinner vstinner merged commit ca719ac into python:master Dec 20, 2017
@vstinner vstinner deleted the pymain_cmdline branch December 20, 2017 17:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants