diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2010-12-18 15:06:45 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2010-12-18 15:06:45 (GMT) |
| commit | 9d254f70928644cb573b0321c912eaabd012bfc4 (patch) | |
| tree | 80cdf1c39c62b8b288a450e030ddccaa9b3a6b0c | |
| parent | c79cf042505d10f134b741f6836e4abfacbcd24f (diff) | |
| download | cpython-9d254f70928644cb573b0321c912eaabd012bfc4.zip cpython-9d254f70928644cb573b0321c912eaabd012bfc4.tar.gz cpython-9d254f70928644cb573b0321c912eaabd012bfc4.tar.bz2 | |
Merged revisions 87368 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r87368 | ezio.melotti | 2010-12-18 15:59:43 +0100 (Sat, 18 Dec 2010) | 1 line
#5587: add a repr to dict_proxy objects. Patch by David Stanek and Daniel Urban.
........
| -rw-r--r-- | Lib/test/test_descr.py | 5 | ||||
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Objects/descrobject.c | 8 |
3 files changed, 15 insertions, 1 deletions
diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py index 9c26ed3..e1c928f 100644 --- a/Lib/test/test_descr.py +++ b/Lib/test/test_descr.py @@ -4262,6 +4262,11 @@ class DictProxyTests(unittest.TestCase): pass self.assertEqual(type(C.__dict__), type(B.__dict__)) + def test_repr(self): + # Testing dict_proxy.__repr__ + dict_ = {k: v for k, v in self.C.__dict__.items()} + self.assertEqual(repr(self.C.__dict__), 'dict_proxy({!r})'.format(dict_)) + class PTypesLongInitTest(unittest.TestCase): # This is in its own TestCase so that it can be run before any other tests. @@ -18,6 +18,9 @@ Core and Builtins float.__divmod__ with respect to signed zeros. -4.0 % 4.0 should be 0.0, not -0.0. +- Issue #5587: add a repr to dict_proxy objects. Patch by David Stanek and + Daniel Urban. + Library ------- diff --git a/Objects/descrobject.c b/Objects/descrobject.c index 5e59271..5f118ce 100644 --- a/Objects/descrobject.c +++ b/Objects/descrobject.c @@ -766,6 +766,12 @@ proxy_str(proxyobject *pp) return PyObject_Str(pp->dict); } +static PyObject * +proxy_repr(proxyobject *pp) +{ + return PyUnicode_FromFormat("dict_proxy(%R)", pp->dict); +} + static int proxy_traverse(PyObject *self, visitproc visit, void *arg) { @@ -791,7 +797,7 @@ PyTypeObject PyDictProxy_Type = { 0, /* tp_getattr */ 0, /* tp_setattr */ 0, /* tp_reserved */ - 0, /* tp_repr */ + (reprfunc)proxy_repr, /* tp_repr */ 0, /* tp_as_number */ &proxy_as_sequence, /* tp_as_sequence */ &proxy_as_mapping, /* tp_as_mapping */ |