[pypy-commit] pypy py3k: let TextIO determine the default stdio encodings (via

pjenvey noreply at buildbot.pypy.org
Thu Apr 25 03:56:19 CEST 2013


Author: Philip Jenvey <pjenvey at underboss.org>
Branch: py3k
Changeset: r63603:56b7a8c5a3ba
Date: 2013-04-24 18:18 -0700
http://bitbucket.org/pypy/pypy/changeset/56b7a8c5a3ba/

Log:	let TextIO determine the default stdio encodings (via
	locale.getpreferredencoding()). fixes windows specifying 'mbcs'
	which is now incompatible w/ backslashreplace

diff --git a/pypy/interpreter/app_main.py b/pypy/interpreter/app_main.py
--- a/pypy/interpreter/app_main.py
+++ b/pypy/interpreter/app_main.py
@@ -240,9 +240,7 @@
         encerr = e
 
     try:
-        if not encoding:
-            encoding = sys.getfilesystemencoding()
-        if ':' in encoding:
+        if encoding and ':' in encoding:
             encoding, errors = encoding.split(':', 1)
         else:
             errors = None


More information about the pypy-commit mailing list