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-34523: Add _PyCoreConfig.filesystem_encoding #8963

Merged
merged 2 commits into from
Aug 29, 2018
Merged

bpo-34523: Add _PyCoreConfig.filesystem_encoding #8963

merged 2 commits into from
Aug 29, 2018

Conversation

vstinner
Copy link
Member

@vstinner vstinner commented Aug 28, 2018

_PyCoreConfig_Read() is now responsible to choose the filesystem
encoding and error handler. Using Py_Main(), the encoding is now
selected even before calling Py_Initialize().

_PyCoreConfig.filesystem_encoding is now the reference instead of
Py_FileSystemDefaultEncoding for the Python filesystem encoding.

Changes:

  • Add filesystem_encoding and filesystem_errors to _PyCoreConfig
  • _PyCoreConfig_Read() now reads the locale encoding for the file
    system encoding. Coerce temporarly the locale or set temporarly the
    LC_CTYPE locale to the user preferred locale.
  • PyUnicode_EncodeFSDefault() and PyUnicode_DecodeFSDefaultAndSize()
    now use the interpreter configuration rather than
    Py_FileSystemDefaultEncoding and Py_FileSystemDefaultEncodeErrors
    global configuration variables.
  • Add _Py_SetFileSystemEncoding() and _Py_ClearFileSystemEncoding()
    private functions to only modify Py_FileSystemDefaultEncoding and
    Py_FileSystemDefaultEncodeErrors in coreconfig.c.
  • _Py_CoerceLegacyLocale() now takes an int ('warn') rather than
    _PyCoreConfig

https://bugs.python.org/issue34523

@vstinner
Copy link
Member Author

config_init_fs_encoding() has complex code to save and modify the locale encoding. I'm not sure if it's needed, since pymain_read_conf() already changes the locale encoding, and reads again the configuration if the encoding changed.

_PyCoreConfig_Read() is now responsible to choose the filesystem
encoding and error handler. Using Py_Main(), the encoding is now
selected even before calling Py_Initialize().

_PyCoreConfig.filesystem_encoding is now the reference instead of
Py_FileSystemDefaultEncoding for the Python filesystem encoding.

Changes:

* Add filesystem_encoding and filesystem_errors to _PyCoreConfig
* _PyCoreConfig_Read() now reads the locale encoding for the file
  system encoding. Coerce temporarly the locale or set temporarly the
  LC_CTYPE locale to the user preferred locale.
* PyUnicode_EncodeFSDefault() and PyUnicode_DecodeFSDefaultAndSize()
  now use the interpreter configuration rather than
  Py_FileSystemDefaultEncoding and Py_FileSystemDefaultEncodeErrors
  global configuration variables.
* Add _Py_SetFileSystemEncoding() and _Py_ClearFileSystemEncoding()
  private functions to only modify Py_FileSystemDefaultEncoding and
  Py_FileSystemDefaultEncodeErrors in coreconfig.c.
* _Py_CoerceLegacyLocale() now takes an int ('warn') rather than
  _PyCoreConfig
@vstinner vstinner merged commit b2457ef into python:master Aug 29, 2018
@vstinner vstinner deleted the fs_encoding branch August 29, 2018 11:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants