Skip to content

Commit ca27e51

Browse files
authored
Merge pull request #3590 from effigies/mnt/getencoding
MNT: Replace deprecated locale.getdefaultlocale
2 parents ef13221 + fcb0e48 commit ca27e51

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

nipype/utils/filemanip.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -670,7 +670,7 @@ def read_stream(stream, logger=None, encoding=None):
670670
671671
672672
"""
673-
default_encoding = encoding or locale.getdefaultlocale()[1] or "UTF-8"
673+
default_encoding = encoding or locale.getpreferredencoding(do_setlocale=False)
674674
logger = logger or fmlogger
675675
try:
676676
out = stream.decode(default_encoding)

nipype/utils/subprocess.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def __init__(self, name, impl):
3030
self._buf = ""
3131
self._rows = []
3232
self._lastidx = 0
33-
self.default_encoding = locale.getdefaultlocale()[1] or "UTF-8"
33+
self.default_encoding = locale.getpreferredencoding(do_setlocale=False)
3434

3535
def fileno(self):
3636
"Pass-through for file descriptor."

0 commit comments

Comments
 (0)