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
9a94a6ac
Commit
9a94a6ac
authored
Jan 09, 2011
by
Antoine Pitrou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #10872: The repr() of TextIOWrapper objects now includes the mode
if available. (at Georg's request)
parent
4275186c
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
51 additions
and
11 deletions
+51
-11
Lib/_pyio.py
Lib/_pyio.py
+10
-3
Lib/test/test_io.py
Lib/test/test_io.py
+4
-1
Misc/NEWS
Misc/NEWS
+3
-0
Modules/_io/textio.c
Modules/_io/textio.c
+34
-7
No files found.
Lib/_pyio.py
View file @
9a94a6ac
...
...
@@ -1504,13 +1504,20 @@ class TextIOWrapper(TextIOBase):
# - "chars_..." for integer variables that count decoded characters
def
__repr__
(
self
):
result
=
"<_pyio.TextIOWrapper"
try
:
name
=
self
.
name
except
AttributeError
:
return
"<_pyio.TextIOWrapper encoding={0!r}>"
.
format
(
self
.
encoding
)
pass
else
:
result
+=
" name={0!r}"
.
format
(
name
)
try
:
mode
=
self
.
mode
except
AttributeError
:
pass
else
:
re
turn
"<_pyio.TextIOWrapper name={0!r} encoding={1!r}>"
.
format
(
name
,
self
.
encoding
)
re
sult
+=
" mode={0!r}"
.
format
(
mode
)
return
result
+
" encoding={0!r}>"
.
format
(
self
.
encoding
)
@
property
def
encoding
(
self
):
...
...
Lib/test/test_io.py
View file @
9a94a6ac
...
...
@@ -1717,9 +1717,12 @@ class TextIOWrapperTest(unittest.TestCase):
raw
.
name
=
"dummy"
self
.
assertEqual
(
repr
(
t
),
"<%s.TextIOWrapper name='dummy' encoding='utf-8'>"
%
modname
)
t
.
mode
=
"r"
self
.
assertEqual
(
repr
(
t
),
"<%s.TextIOWrapper name='dummy' mode='r' encoding='utf-8'>"
%
modname
)
raw
.
name
=
b"dummy"
self
.
assertEqual
(
repr
(
t
),
"<%s.TextIOWrapper name=b'dummy' encoding='utf-8'>"
%
modname
)
"<%s.TextIOWrapper name=b'dummy'
mode='r'
encoding='utf-8'>"
%
modname
)
def
test_line_buffering
(
self
):
r
=
self
.
BytesIO
()
...
...
Misc/NEWS
View file @
9a94a6ac
...
...
@@ -40,6 +40,9 @@ Core and Builtins
Library
-------
- Issue #10872: The repr() of TextIOWrapper objects now includes the mode
if available.
- Issue #10869: Fixed bug where ast.increment_lineno modified the root
node twice.
...
...
Modules/_io/textio.c
View file @
9a94a6ac
...
...
@@ -2323,25 +2323,52 @@ textiowrapper_truncate(textio *self, PyObject *args)
static
PyObject
*
textiowrapper_repr
(
textio
*
self
)
{
PyObject
*
nameobj
,
*
re
s
;
PyObject
*
nameobj
,
*
modeobj
,
*
res
,
*
s
;
CHECK_INITIALIZED
(
self
);
res
=
PyUnicode_FromString
(
"<_io.TextIOWrapper"
);
if
(
res
==
NULL
)
return
NULL
;
nameobj
=
PyObject_GetAttrString
((
PyObject
*
)
self
,
"name"
);
if
(
nameobj
==
NULL
)
{
if
(
PyErr_ExceptionMatches
(
PyExc_AttributeError
))
PyErr_Clear
();
else
return
NULL
;
res
=
PyUnicode_FromFormat
(
"<_io.TextIOWrapper encoding=%R>"
,
self
->
encoding
);
goto
error
;
}
else
{
res
=
PyUnicode_FromFormat
(
"<_io.TextIOWrapper name=%R encoding=%R>"
,
nameobj
,
self
->
encoding
);
s
=
PyUnicode_FromFormat
(
" name=%R"
,
nameobj
);
Py_DECREF
(
nameobj
);
if
(
s
==
NULL
)
goto
error
;
PyUnicode_AppendAndDel
(
&
res
,
s
);
if
(
res
==
NULL
)
return
NULL
;
}
return
res
;
modeobj
=
PyObject_GetAttrString
((
PyObject
*
)
self
,
"mode"
);
if
(
modeobj
==
NULL
)
{
if
(
PyErr_ExceptionMatches
(
PyExc_AttributeError
))
PyErr_Clear
();
else
goto
error
;
}
else
{
s
=
PyUnicode_FromFormat
(
" mode=%R"
,
modeobj
);
Py_DECREF
(
modeobj
);
if
(
s
==
NULL
)
goto
error
;
PyUnicode_AppendAndDel
(
&
res
,
s
);
if
(
res
==
NULL
)
return
NULL
;
}
s
=
PyUnicode_FromFormat
(
"%U encoding=%R>"
,
res
,
self
->
encoding
);
Py_DECREF
(
res
);
return
s
;
error:
Py_XDECREF
(
res
);
return
NULL
;
}
...
...
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