Commit 9d254f70 authored by Ezio Melotti's avatar Ezio Melotti

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.
........
parent c79cf042
...@@ -4262,6 +4262,11 @@ class DictProxyTests(unittest.TestCase): ...@@ -4262,6 +4262,11 @@ class DictProxyTests(unittest.TestCase):
pass pass
self.assertEqual(type(C.__dict__), type(B.__dict__)) 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): class PTypesLongInitTest(unittest.TestCase):
# This is in its own TestCase so that it can be run before any other tests. # This is in its own TestCase so that it can be run before any other tests.
......
...@@ -18,6 +18,9 @@ Core and Builtins ...@@ -18,6 +18,9 @@ Core and Builtins
float.__divmod__ with respect to signed zeros. -4.0 % 4.0 should be float.__divmod__ with respect to signed zeros. -4.0 % 4.0 should be
0.0, not -0.0. 0.0, not -0.0.
- Issue #5587: add a repr to dict_proxy objects. Patch by David Stanek and
Daniel Urban.
Library Library
------- -------
......
...@@ -766,6 +766,12 @@ proxy_str(proxyobject *pp) ...@@ -766,6 +766,12 @@ proxy_str(proxyobject *pp)
return PyObject_Str(pp->dict); return PyObject_Str(pp->dict);
} }
static PyObject *
proxy_repr(proxyobject *pp)
{
return PyUnicode_FromFormat("dict_proxy(%R)", pp->dict);
}
static int static int
proxy_traverse(PyObject *self, visitproc visit, void *arg) proxy_traverse(PyObject *self, visitproc visit, void *arg)
{ {
...@@ -791,7 +797,7 @@ PyTypeObject PyDictProxy_Type = { ...@@ -791,7 +797,7 @@ PyTypeObject PyDictProxy_Type = {
0, /* tp_getattr */ 0, /* tp_getattr */
0, /* tp_setattr */ 0, /* tp_setattr */
0, /* tp_reserved */ 0, /* tp_reserved */
0, /* tp_repr */ (reprfunc)proxy_repr, /* tp_repr */
0, /* tp_as_number */ 0, /* tp_as_number */
&proxy_as_sequence, /* tp_as_sequence */ &proxy_as_sequence, /* tp_as_sequence */
&proxy_as_mapping, /* tp_as_mapping */ &proxy_as_mapping, /* tp_as_mapping */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment