mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 18:59:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

_pyio: Fix TextIOWrapper constructor: os has no device_encoding() function

Browse source 
_io module doesn't call this function which was introduced in Python3.
This commit is contained in:
Victor Stinner 2010-05-04 11:35:36 +00:00
parent 268e4872d3
commit 7120219918
1 changed files with 6 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Lib/_pyio.py
View file

@ -1438,17 +1438,12 @@ class TextIOWrapper(TextIOBase):
raise ValueError("illegal newline value: %r" % (newline,)) raise ValueError("illegal newline value: %r" % (newline,))
if encoding is None: if encoding is None:
try: try:
encoding = os.device_encoding(buffer.fileno()) import locale
except (AttributeError, UnsupportedOperation): except ImportError:
pass # Importing locale may fail if Python is being built
if encoding is None: encoding = "ascii"
try: else:
import locale encoding = locale.getpreferredencoding()
except ImportError:
# Importing locale may fail if Python is being built
encoding = "ascii"
else:
encoding = locale.getpreferredencoding()
if not isinstance(encoding, basestring): if not isinstance(encoding, basestring):
raise ValueError("invalid encoding: %r" % encoding) raise ValueError("invalid encoding: %r" % encoding)