Commit0fd074a

committed

Replace key if not identical to old key

1 parent586b24d commit0fd074aCopy full SHA for 0fd074a

File tree

+38

-0

lines changed

+38

-0

lines changed

Lines changed: 15 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -618,6 +618,21 @@ def __hash__(self):`
`618`	`618`	`withself.assertRaises(Exc):`
`619`	`619`	`d1==d2`
`620`	`620`
	`621`	`+deftest_eq_replace(self):`
	`622`	`+classAlwaysEqualCmp(object):`
	`623`	`+def__eq__(self,other):`
	`624`	`+returnTrue`
	`625`	`+`
	`626`	`+def__hash__(self):`
	`627`	`+return1`
	`628`	`+`
	`629`	`+o1=AlwaysEqualCmp()`
	`630`	`+d3= {}`
	`631`	`+d3[o1]=1`
	`632`	`+o2=AlwaysEqualCmp()`
	`633`	`+d3[o2]=2`
	`634`	`+asserttuple(d3.keys())[0]iso2`
	`635`	`+`
`621`	`636`	`deftest_keys_contained(self):`
`622`	`637`	`self.helper_keys_contained(lambdax:x.keys())`
`623`	`638`	`self.helper_keys_contained(lambdax:x.items())`

Lines changed: 13 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1797,6 +1797,19 @@ def test_weak_keyed_bad_delitem(self):`
`1797`	`1797`	`self.assertRaises(TypeError,d.__getitem__,13)`
`1798`	`1798`	`self.assertRaises(TypeError,d.__setitem__,13,13)`
`1799`	`1799`
	`1800`	`+deftest_weak_keyed_equal_replacement(self):`
	`1801`	`+d=weakref.WeakKeyDictionary()`
	`1802`	`+o1=Object('1')`
	`1803`	`+o2=Object('1')`
	`1804`	`+d[o1]=1`
	`1805`	`+d[o2]=2`
	`1806`	`+assertlen(d)==1`
	`1807`	`+assertd[o2]==2`
	`1808`	`+asserttuple(d.keys())[0]iso2`
	`1809`	`+delo1`
	`1810`	`+assertlen(d)==1`
	`1811`	`+asserttuple(d.keys())[0]iso2`
	`1812`	`+`
`1800`	`1813`	`deftest_weak_keyed_cascading_deletes(self):`
`1801`	`1814`	`# SF bug 742860. For some reason, before 2.3 __delitem__ iterated`
`1802`	`1815`	`# over the keys via self.data.iterkeys(). If things vanished from`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1222,6 +1222,7 @@ Consumes key and value references.`
`1222`	`1222`	`staticint`
`1223`	`1223`	`insertdict(PyDictObjectmp,PyObjectkey,Py_hash_thash,PyObject*value)`
`1224`	`1224`	`{`
	`1225`	`+PyObject*old_key;`
`1225`	`1226`	`PyObject*old_value;`
`1226`	`1227`
`1227`	`1228`	`if (DK_IS_UNICODE(mp->ma_keys)&& !PyUnicode_CheckExact(key)) {`
`@@ -1279,6 +1280,15 @@ insertdict(PyDictObject mp, PyObject key, Py_hash_t hash, PyObject *value)`
`1279`	`1280`	`return0;`
`1280`	`1281`	`}`
`1281`	`1282`
	`1283`	`+if (!DK_IS_UNICODE(mp->ma_keys)) {`
	`1284`	`+PyDictKeyEntry*ep=&DK_ENTRIES(mp->ma_keys)[ix];`
	`1285`	`+old_key=ep->me_key;`
	`1286`	`+if (old_key!=key) {`
	`1287`	`+ep->me_key=key;`
	`1288`	`+key=old_key;`
	`1289`	`+ }`
	`1290`	`+ }`
	`1291`	`+`
`1282`	`1292`	`if (old_value!=value) {`
`1283`	`1293`	`if (_PyDict_HasSplitTable(mp)) {`
`1284`	`1294`	`mp->ma_values->values[ix]=value;`

Comments

(0)