Issue #15079: make a test applicable to both C and Python versions of the pickle...

author Antoine Pitrou <solipsis@pitrou.net>

Tue, 26 Jun 2012 21:05:27 +0000 (23:05 +0200)

committer Antoine Pitrou <solipsis@pitrou.net>

Tue, 26 Jun 2012 21:05:27 +0000 (23:05 +0200)
author Antoine Pitrou <solipsis@pitrou.net>
Tue, 26 Jun 2012 21:05:27 +0000 (23:05 +0200)
committer Antoine Pitrou <solipsis@pitrou.net>
Tue, 26 Jun 2012 21:05:27 +0000 (23:05 +0200)
diff --cc Lib/test/pickletester.py
Simple merge
diff --cc Misc/ACKS

index c1c3cbd40fe66187085e4ed97a658c3a9c2b1867,514e95dbec941d5d84781f06a988bfa472c8be13..6d8681e02e816eb54fbcdbd05dfaac8c140aeaa5
--- 1/Misc/ACKS
--- 2/Misc/ACKS
+++ b/Misc/ACKS
@@@ -695,9 -630,10 +695,10 @@@ Alexis Métairea
   Steven Miale
   Trent Mick
   Stan Mihai
+ Stefan Mihaila
   Aristotelis Mikropoulos
- -Damien Miller
   Chad Miller
+ +Damien Miller
   Jason V. Miller
   Jay T. Miller
   Roman Milner
author	Antoine Pitrou <solipsis@pitrou.net>
	Tue, 26 Jun 2012 21:05:27 +0000 (23:05 +0200)
committer	Antoine Pitrou <solipsis@pitrou.net>
	Tue, 26 Jun 2012 21:05:27 +0000 (23:05 +0200)
		1	2
Lib/test/pickletester.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/ACKS	patch \|	diff1 \|	diff2 \|	blob \| history