Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Fixed repr of dictionary views.

This commit is contained in:
Alexandre Vassalotti 2010-01-12 01:34:43 +00:00
parent ae7731af45
commit 58a96efde5
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Lib/test/test_dictviews.py
View File

@ -72,9 +72,18 @@ class DictSetTest(unittest.TestCase):
def test_dict_repr(self):
d = {1: 10, "a": "ABC"}
self.assertTrue(isinstance(repr(d), str))
self.assertTrue(isinstance(repr(d.viewitems()), str))
self.assertTrue(isinstance(repr(d.viewkeys()), str))
self.assertTrue(isinstance(repr(d.viewvalues()), str))
r = repr(d.viewitems())
self.assertTrue(isinstance(r, str))
self.assertTrue(r == "dict_items([('a', 'ABC'), (1, 10)])" or
r == "dict_items([(1, 10), ('a', 'ABC')])")
r = repr(d.viewkeys())
self.assertTrue(isinstance(r, str))
self.assertTrue(r == "dict_keys(['a', 1])" or
r == "dict_keys([1, 'a'])")
r = repr(d.viewvalues())
self.assertTrue(isinstance(r, str))
self.assertTrue(r == "dict_values(['ABC', 10])" or
r == "dict_values([10, 'ABC'])")
def test_main():

3
Objects/dictobject.c
View File

@ -2886,7 +2886,8 @@ dictview_repr(dictviewobject *dv)
return NULL;
seq_str = PyObject_Repr(seq);
result = PyString_FromFormat("%s(%s)", Py_TYPE(dv)->tp_name, seq_str);
result = PyString_FromFormat("%s(%s)", Py_TYPE(dv)->tp_name,
PyString_AS_STRING(seq_str));
Py_DECREF(seq_str);
Py_DECREF(seq);
return result;