diff options
| author | Raymond Hettinger <python@rcn.com> | 2011-06-29 23:44:36 (GMT) |
|---|---|---|
| committer | Raymond Hettinger <python@rcn.com> | 2011-06-29 23:44:36 (GMT) |
| commit | bf7a266074b2c4e97f3386dbf2c8dbf12a0514ac (patch) | |
| tree | ff19fc78d26b5d4a4e36481774f91fd6d0a9d983 | |
| parent | 470a41078b17f42aead78e534541a87d6378d662 (diff) | |
| download | cpython-bf7a266074b2c4e97f3386dbf2c8dbf12a0514ac.zip cpython-bf7a266074b2c4e97f3386dbf2c8dbf12a0514ac.tar.gz cpython-bf7a266074b2c4e97f3386dbf2c8dbf12a0514ac.tar.bz2 | |
Fixup repr for dict_proxy objects.
| -rw-r--r-- | Lib/test/test_descr.py | 4 | ||||
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | Objects/descrobject.c | 16 |
3 files changed, 21 insertions, 1 deletions
diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py index dc18f33..b5d9890 100644 --- a/Lib/test/test_descr.py +++ b/Lib/test/test_descr.py @@ -4589,6 +4589,10 @@ class DictProxyTests(unittest.TestCase): pass self.C = C + def test_repr(self): + self.assertIn('dict_proxy({', repr(vars(self.C))) + self.assertIn("'meth':", repr(vars(self.C))) + def test_iter_keys(self): # Testing dict-proxy iterkeys... keys = [ key for key in self.C.__dict__.iterkeys() ] @@ -13,6 +13,8 @@ Core and Builtins the following case: sys.stdin.read() stopped with CTRL+d (end of file), raw_input() interrupted by CTRL+c. +- dict_proxy objects now display their contents rather than just the class name. + Library ------- diff --git a/Objects/descrobject.c b/Objects/descrobject.c index 135b6d2..8e7ea7d 100644 --- a/Objects/descrobject.c +++ b/Objects/descrobject.c @@ -801,6 +801,20 @@ proxy_str(proxyobject *pp) return PyObject_Str(pp->dict); } +static PyObject * +proxy_repr(proxyobject *pp) +{ + PyObject *dictrepr; + PyObject *result; + + dictrepr = PyObject_Repr(pp->dict); + if (dictrepr == NULL) + return NULL; + result = PyString_FromFormat("dict_proxy(%s)", PyString_AS_STRING(dictrepr)); + Py_DECREF(dictrepr); + return result; +} + static int proxy_traverse(PyObject *self, visitproc visit, void *arg) { @@ -832,7 +846,7 @@ PyTypeObject PyDictProxy_Type = { 0, /* tp_getattr */ 0, /* tp_setattr */ (cmpfunc)proxy_compare, /* tp_compare */ - 0, /* tp_repr */ + (reprfunc)proxy_repr, /* tp_repr */ 0, /* tp_as_number */ &proxy_as_sequence, /* tp_as_sequence */ &proxy_as_mapping, /* tp_as_mapping */ |