Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
0f599891
Commit
0f599891
authored
Jun 02, 2008
by
Martin v. Löwis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Forward-port PYTHONIOENCODING.
parent
e95593e9
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
45 additions
and
6 deletions
+45
-6
Doc/using/cmdline.rst
Doc/using/cmdline.rst
+7
-0
Lib/test/test_sys.py
Lib/test/test_sys.py
+20
-0
Modules/main.c
Modules/main.c
+1
-0
Python/pythonrun.c
Python/pythonrun.c
+17
-6
No files found.
Doc/using/cmdline.rst
View file @
0f599891
...
...
@@ -467,6 +467,13 @@ if Python was configured with the :option:`--with-pydebug` build option.
If set, Python will dump objects and reference counts still alive after
shutting down the interpreter.
.. envvar:: PYTHONIOENCODING
Overrides the encoding used for stdin/stdout/stderr, in the syntax
encodingname:errorhandler, with the :errors part being optional.
.. versionadded:: 2.6
.. envvar:: PYTHONMALLOCSTATS
...
...
Lib/test/test_sys.py
View file @
0f599891
...
...
@@ -349,6 +349,26 @@ class SysModuleTest(unittest.TestCase):
#self.assert_(r[0][1] > 100, r[0][1])
#self.assert_(r[0][2] > 100, r[0][2])
def
test_ioencoding
(
self
):
import
subprocess
,
os
env
=
dict
(
os
.
environ
)
# Test character: cent sign, encoded as 0x4A (ASCII J) in CP424,
# not representable in ASCII.
env
[
"PYTHONIOENCODING"
]
=
"cp424"
p
=
subprocess
.
Popen
([
sys
.
executable
,
"-c"
,
'print(chr(0xa2))'
],
stdout
=
subprocess
.
PIPE
,
env
=
env
)
out
=
p
.
stdout
.
read
()
self
.
assertEqual
(
out
,
"
\
xa2
\
n
"
.
encode
(
"cp424"
))
env
[
"PYTHONIOENCODING"
]
=
"ascii:replace"
p
=
subprocess
.
Popen
([
sys
.
executable
,
"-c"
,
'print(chr(0xa2))'
],
stdout
=
subprocess
.
PIPE
,
env
=
env
)
out
=
p
.
stdout
.
read
().
strip
()
self
.
assertEqual
(
out
,
b'?'
)
def
test_main
():
test
.
support
.
run_unittest
(
SysModuleTest
)
...
...
Modules/main.c
View file @
0f599891
...
...
@@ -96,6 +96,7 @@ static char *usage_5 = "\
PYTHONHOME : alternate <prefix> directory (or <prefix>%c<exec_prefix>).
\n
\
The default module search path uses %s.
\n
\
PYTHONCASEOK : ignore case in 'import' statements (Windows).
\n
\
PYTHONIOENCODING: Encoding[:errors] used for stdin/stdout/stderr.
\n
\
"
;
#ifndef MS_WINDOWS
...
...
Python/pythonrun.c
View file @
0f599891
...
...
@@ -701,6 +701,7 @@ initstdio(void)
PyObject
*
std
=
NULL
;
int
status
=
0
,
fd
;
PyObject
*
encoding_attr
;
char
*
encoding
,
*
errors
;
/* Hack to avoid a nasty recursion issue when Python is invoked
in verbose mode: pre-import the Latin-1 and UTF-8 codecs */
...
...
@@ -730,6 +731,16 @@ initstdio(void)
goto
error
;
}
encoding
=
Py_GETENV
(
"PYTHONIOENCODING"
);
if
(
encoding
)
{
encoding
=
strdup
(
encoding
);
errors
=
strchr
(
encoding
,
':'
);
if
(
errors
)
{
*
errors
=
'\0'
;
errors
++
;
}
}
/* Set sys.stdin */
fd
=
fileno
(
stdin
);
/* Under some conditions stdin, stdout and stderr may not be connected
...
...
@@ -745,8 +756,8 @@ initstdio(void)
#endif
}
else
{
if
(
!
(
std
=
PyFile_FromFd
(
fd
,
"<stdin>"
,
"r"
,
-
1
,
NULL
,
NULL
,
"
\n
"
,
0
)))
{
if
(
!
(
std
=
PyFile_FromFd
(
fd
,
"<stdin>"
,
"r"
,
-
1
,
encoding
,
errors
,
"
\n
"
,
0
)))
{
goto
error
;
}
}
/* if (fd < 0) */
...
...
@@ -765,8 +776,8 @@ initstdio(void)
#endif
}
else
{
if
(
!
(
std
=
PyFile_FromFd
(
fd
,
"<stdout>"
,
"w"
,
-
1
,
NULL
,
NULL
,
"
\n
"
,
0
)))
{
if
(
!
(
std
=
PyFile_FromFd
(
fd
,
"<stdout>"
,
"w"
,
-
1
,
encoding
,
errors
,
"
\n
"
,
0
)))
{
goto
error
;
}
}
/* if (fd < 0) */
...
...
@@ -786,8 +797,8 @@ initstdio(void)
#endif
}
else
{
if
(
!
(
std
=
PyFile_FromFd
(
fd
,
"<stderr>"
,
"w"
,
-
1
,
NULL
,
NULL
,
"
\n
"
,
0
)))
{
if
(
!
(
std
=
PyFile_FromFd
(
fd
,
"<stderr>"
,
"w"
,
-
1
,
encoding
,
errors
,
"
\n
"
,
0
)))
{
goto
error
;
}
}
/* if (fd < 0) */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment