MERGE: Better test for Issue #15402: Add a __sizeof__ method to struct.Struct

author Jesus Cea <jcea@jcea.es>

Mon, 23 Jul 2012 16:16:18 +0000 (18:16 +0200)

committer Jesus Cea <jcea@jcea.es>

Mon, 23 Jul 2012 16:16:18 +0000 (18:16 +0200)
author Jesus Cea <jcea@jcea.es>
Mon, 23 Jul 2012 16:16:18 +0000 (18:16 +0200)
committer Jesus Cea <jcea@jcea.es>
Mon, 23 Jul 2012 16:16:18 +0000 (18:16 +0200)
diff --cc Doc/ACKS.txt
Simple merge
diff --cc Lib/test/test_struct.py
Simple merge
author	Jesus Cea <jcea@jcea.es>
	Mon, 23 Jul 2012 16:16:18 +0000 (18:16 +0200)
committer	Jesus Cea <jcea@jcea.es>
	Mon, 23 Jul 2012 16:16:18 +0000 (18:16 +0200)
		1	2
Doc/ACKS.txt	patch \|	diff1 \|	diff2 \|	blob \| history
Lib/test/test_struct.py	patch \|	diff1 \|	diff2 \|	blob \| history