Skip to content

Commit

Permalink
BUG: fix an incoming incompatibility with Python 3.15 (locale.getdefa…
Browse files Browse the repository at this point in the history
…ultlocale is deprecated in Python 3.12)
  • Loading branch information
neutrinoceros committed Jul 19, 2024
1 parent 2a27dff commit ac51de6
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 10 deletions.
3 changes: 3 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,9 @@ Infrastructure, Utility and Other Changes and Additions

- Versions of PyVO <1.5 are no longer supported. [#3002]

- Fix an incoming incompatibility with Python 3.15 (`locale.getdefaultlocale`
is deprecated in Python 3.12) [#3070]

utils.tap
^^^^^^^^^

Expand Down
24 changes: 14 additions & 10 deletions ah_bootstrap.py
Original file line number Diff line number Diff line change
Expand Up @@ -838,16 +838,20 @@ def run_cmd(cmd):
'`{0}` command:\n{1}'.format(' '.join(cmd), str(e)))


# Can fail of the default locale is not configured properly. See
# https://github.com/astropy/astropy/issues/2749. For the purposes under
# consideration 'latin1' is an acceptable fallback.
try:
stdio_encoding = locale.getdefaultlocale()[1] or 'latin1'
except ValueError:
# Due to an OSX oddity locale.getdefaultlocale() can also crash
# depending on the user's locale/language settings. See:
# https://bugs.python.org/issue18378
stdio_encoding = 'latin1'
if sys.version_info >= (3, 11):
stdio_encoding = locale.getencoding()
else:
# Can fail of the default locale is not configured properly. See
# https://github.com/astropy/astropy/issues/2749. For the purposes under
# consideration 'latin1' is an acceptable fallback.
try:
stdio_encoding = locale.getdefaultlocale()[1] or 'latin1'
except ValueError:
# Due to an OSX oddity locale.getdefaultlocale() can also crash
# depending on the user's locale/language settings. See:
# https://bugs.python.org/issue18378
stdio_encoding = 'latin1'


# Unlikely to fail at this point but even then let's be flexible
if not isinstance(stdout, str):
Expand Down

0 comments on commit ac51de6

Please sign in to comment.