Skip to content

Commit 163e61d

Browse files
committed
Fix PYTHONIOENCODING parsing when encoding is empty + address review comments
1 parent 31c9e82 commit 163e61d

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/GraalPythonModuleBuiltins.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,14 +129,14 @@ public void initialize(PythonCore core) {
129129
String standardStreamError;
130130
if (encodingOpt != null && !encodingOpt.isEmpty()) {
131131
String[] parts = encodingOpt.split(":");
132-
standardStreamEncoding = parts[0];
133-
standardStreamError = parts.length > 1 ? parts[1] : "strict";
132+
standardStreamEncoding = parts[0].isEmpty() ? "utf-8" : parts[0];
133+
standardStreamError = parts.length > 1 && !parts[1].isEmpty() ? parts[1] : "strict";
134134
} else {
135135
standardStreamEncoding = "utf-8";
136136
standardStreamError = "surrogateescape";
137137
}
138138

139-
if (LOGGER.isLoggable(Level.INFO)) {
139+
if (LOGGER.isLoggable(Level.FINE)) {
140140
LOGGER.fine(String.format("Setting default stdio encoding to %s:%s", standardStreamEncoding, standardStreamError));
141141
}
142142
this.builtinConstants.put("stdio_encoding", standardStreamEncoding);

graalpython/lib-graalpython/pyio_patches.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ def open(*args, **kwargs):
8383

8484
setattr(builtins, 'open', open)
8585

86-
import __graalpython__
8786
sys.stdin = _pyio.TextIOWrapper(_pyio.BufferedReader(sys.stdin), encoding=__graalpython__.stdio_encoding, errors=__graalpython__.stdio_error, line_buffering=True)
8887
sys.stdin.mode = "r"
8988
sys.__stdin__ = sys.stdin

0 commit comments

Comments
 (0)