summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Lib/test/test_descr.py5
-rw-r--r--Misc/NEWS3
-rw-r--r--Objects/descrobject.c8
3 files changed, 15 insertions, 1 deletions
diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py
index 233b7cb..115d1e8 100644
--- a/Lib/test/test_descr.py
+++ b/Lib/test/test_descr.py
@@ -4268,6 +4268,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.
diff --git a/Misc/NEWS b/Misc/NEWS
index fdda482..020ddd1 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -17,6 +17,9 @@ Core and Builtins
rather than the Py_IsInitialized flag, avoiding a Fatal Python
error in certain circumstances when an import is done in __del__.
+- 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 9671102..11c68d3 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 */