[Python-checkins] r72870 - in python/branches/py3k: Lib/_pyio.py Lib/test/test_fileio.py Lib/test/test_io.py Misc/NEWS Modules/_io/bufferedio.c Modules/_io/fileio.c Modules/_io/textio.c
antoine.pitrou
python-checkins at python.org
Sat May 23 21:04:03 CEST 2009
Author: antoine.pitrou
Date: Sat May 23 21:04:03 2009
New Revision: 72870
Log:
Issue #5761: Add the name of the underlying file to the repr() of various IO objects.
Modified:
python/branches/py3k/Lib/_pyio.py
python/branches/py3k/Lib/test/test_fileio.py
python/branches/py3k/Lib/test/test_io.py
python/branches/py3k/Misc/NEWS
python/branches/py3k/Modules/_io/bufferedio.c
python/branches/py3k/Modules/_io/fileio.c
python/branches/py3k/Modules/_io/textio.c
Modified: python/branches/py3k/Lib/_pyio.py
==============================================================================
--- python/branches/py3k/Lib/_pyio.py (original)
+++ python/branches/py3k/Lib/_pyio.py Sat May 23 21:04:03 2009
@@ -736,6 +736,15 @@
def mode(self):
return self.raw.mode
+ def __repr__(self):
+ clsname = self.__class__.__name__
+ try:
+ name = self.name
+ except AttributeError:
+ return "<_pyio.{0}>".format(clsname)
+ else:
+ return "<_pyio.{0} name={1!r}>".format(clsname, name)
+
### Lower-level APIs ###
def fileno(self):
@@ -1455,7 +1464,13 @@
# - "chars_..." for integer variables that count decoded characters
def __repr__(self):
- return "<TextIOWrapper encoding={0}>".format(self.encoding)
+ try:
+ name = self.name
+ except AttributeError:
+ return "<_pyio.TextIOWrapper encoding={0!r}>".format(self.encoding)
+ else:
+ return "<_pyio.TextIOWrapper name={0!r} encoding={1!r}>".format(
+ name, self.encoding)
@property
def encoding(self):
Modified: python/branches/py3k/Lib/test/test_fileio.py
==============================================================================
--- python/branches/py3k/Lib/test/test_fileio.py (original)
+++ python/branches/py3k/Lib/test/test_fileio.py Sat May 23 21:04:03 2009
@@ -70,9 +70,13 @@
self.assertEquals(array('b', [1, 2]), a[:n])
def testRepr(self):
- self.assertEquals(repr(self.f),
- "io.FileIO(%d, %s)" % (self.f.fileno(),
- repr(self.f.mode)))
+ self.assertEquals(repr(self.f), "<_io.FileIO name=%r mode=%r>"
+ % (self.f.name, self.f.mode))
+ del self.f.name
+ self.assertEquals(repr(self.f), "<_io.FileIO fd=%r mode=%r>"
+ % (self.f.fileno(), self.f.mode))
+ self.f.close()
+ self.assertEquals(repr(self.f), "<_io.FileIO [closed]>")
def testErrors(self):
f = self.f
Modified: python/branches/py3k/Lib/test/test_io.py
==============================================================================
--- python/branches/py3k/Lib/test/test_io.py (original)
+++ python/branches/py3k/Lib/test/test_io.py Sat May 23 21:04:03 2009
@@ -618,6 +618,16 @@
self.assert_(s.startswith("Exception IOError: "), s)
self.assert_(s.endswith(" ignored"), s)
+ def test_repr(self):
+ raw = self.MockRawIO()
+ b = self.tp(raw)
+ clsname = "%s.%s" % (self.tp.__module__, self.tp.__name__)
+ self.assertEqual(repr(b), "<%s>" % clsname)
+ raw.name = "dummy"
+ self.assertEqual(repr(b), "<%s name='dummy'>" % clsname)
+ raw.name = b"dummy"
+ self.assertEqual(repr(b), "<%s name=b'dummy'>" % clsname)
+
class BufferedReaderTest(unittest.TestCase, CommonBufferedTests):
read_mode = "rb"
@@ -1528,7 +1538,15 @@
raw = self.BytesIO("hello".encode("utf-8"))
b = self.BufferedReader(raw)
t = self.TextIOWrapper(b, encoding="utf-8")
- self.assertEqual(repr(t), "<TextIOWrapper encoding=utf-8>")
+ modname = self.TextIOWrapper.__module__
+ self.assertEqual(repr(t),
+ "<%s.TextIOWrapper encoding='utf-8'>" % modname)
+ raw.name = "dummy"
+ self.assertEqual(repr(t),
+ "<%s.TextIOWrapper name='dummy' encoding='utf-8'>" % modname)
+ raw.name = b"dummy"
+ self.assertEqual(repr(t),
+ "<%s.TextIOWrapper name=b'dummy' encoding='utf-8'>" % modname)
def test_line_buffering(self):
r = self.BytesIO()
Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS (original)
+++ python/branches/py3k/Misc/NEWS Sat May 23 21:04:03 2009
@@ -32,6 +32,9 @@
Library
-------
+- Issue #5761: Add the name of the underlying file to the repr() of various
+ IO objects.
+
- Issue #5259: smtplib plain auth login no longer gives a traceback. Fix
by Musashi Tamura, tests by Marcin Bachry.
Modified: python/branches/py3k/Modules/_io/bufferedio.c
==============================================================================
--- python/branches/py3k/Modules/_io/bufferedio.c (original)
+++ python/branches/py3k/Modules/_io/bufferedio.c Sat May 23 21:04:03 2009
@@ -1123,6 +1123,27 @@
return line;
}
+static PyObject *
+Buffered_repr(BufferedObject *self)
+{
+ PyObject *nameobj, *res;
+
+ nameobj = PyObject_GetAttrString((PyObject *) self, "name");
+ if (nameobj == NULL) {
+ if (PyErr_ExceptionMatches(PyExc_AttributeError))
+ PyErr_Clear();
+ else
+ return NULL;
+ res = PyUnicode_FromFormat("<%s>", Py_TYPE(self)->tp_name);
+ }
+ else {
+ res = PyUnicode_FromFormat("<%s name=%R>",
+ Py_TYPE(self)->tp_name, nameobj);
+ Py_DECREF(nameobj);
+ }
+ return res;
+}
+
/*
* class BufferedReader
*/
@@ -1472,7 +1493,7 @@
0, /*tp_getattr*/
0, /*tp_setattr*/
0, /*tp_compare */
- 0, /*tp_repr*/
+ (reprfunc)Buffered_repr, /*tp_repr*/
0, /*tp_as_number*/
0, /*tp_as_sequence*/
0, /*tp_as_mapping*/
@@ -1828,7 +1849,7 @@
0, /*tp_getattr*/
0, /*tp_setattr*/
0, /*tp_compare */
- 0, /*tp_repr*/
+ (reprfunc)Buffered_repr, /*tp_repr*/
0, /*tp_as_number*/
0, /*tp_as_sequence*/
0, /*tp_as_mapping*/
@@ -2219,7 +2240,7 @@
0, /*tp_getattr*/
0, /*tp_setattr*/
0, /*tp_compare */
- 0, /*tp_repr*/
+ (reprfunc)Buffered_repr, /*tp_repr*/
0, /*tp_as_number*/
0, /*tp_as_sequence*/
0, /*tp_as_mapping*/
Modified: python/branches/py3k/Modules/_io/fileio.c
==============================================================================
--- python/branches/py3k/Modules/_io/fileio.c (original)
+++ python/branches/py3k/Modules/_io/fileio.c Sat May 23 21:04:03 2009
@@ -846,11 +846,26 @@
static PyObject *
fileio_repr(PyFileIOObject *self)
{
+ PyObject *nameobj, *res;
+
if (self->fd < 0)
- return PyUnicode_FromFormat("io.FileIO(-1)");
+ return PyUnicode_FromFormat("<_io.FileIO [closed]>");
- return PyUnicode_FromFormat("io.FileIO(%d, '%s')",
- self->fd, mode_string(self));
+ nameobj = PyObject_GetAttrString((PyObject *) self, "name");
+ if (nameobj == NULL) {
+ if (PyErr_ExceptionMatches(PyExc_AttributeError))
+ PyErr_Clear();
+ else
+ return NULL;
+ res = PyUnicode_FromFormat("<_io.FileIO fd=%d mode='%s'>",
+ self->fd, mode_string(self));
+ }
+ else {
+ res = PyUnicode_FromFormat("<_io.FileIO name=%R mode='%s'>",
+ nameobj, mode_string(self));
+ Py_DECREF(nameobj);
+ }
+ return res;
}
static PyObject *
Modified: python/branches/py3k/Modules/_io/textio.c
==============================================================================
--- python/branches/py3k/Modules/_io/textio.c (original)
+++ python/branches/py3k/Modules/_io/textio.c Sat May 23 21:04:03 2009
@@ -2308,8 +2308,25 @@
static PyObject *
TextIOWrapper_repr(PyTextIOWrapperObject *self)
{
- CHECK_INITIALIZED(self);
- return PyUnicode_FromFormat("<TextIOWrapper encoding=%S>", self->encoding);
+ PyObject *nameobj, *res;
+
+ CHECK_INITIALIZED(self);
+
+ 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);
+ }
+ else {
+ res = PyUnicode_FromFormat("<_io.TextIOWrapper name=%R encoding=%R>",
+ nameobj, self->encoding);
+ Py_DECREF(nameobj);
+ }
+ return res;
}
More information about the Python-checkins
mailing list