From 6b449f4f2bd86c104a8b57547428eb9bb3a182b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Mon, 3 Dec 2007 19:20:02 +0000
Subject: [PATCH] Issue #1727780: Support loading pickles of random.Random
 objects created on 32-bit systems on 64-bit systems, and vice versa. As a
 consequence of the change, Random pickles created by Python 2.6 cannot be
 loaded in Python 2.5.

---
 Doc/library/random.rst  |   3 +++
 Lib/random.py           |  15 +++++++++++++--
 Lib/test/randv2_32.pck  | Bin 0 -> 7517 bytes
 Lib/test/randv2_64.pck  | Bin 0 -> 7365 bytes
 Lib/test/randv3.pck     | Bin 0 -> 8004 bytes
 Lib/test/test_random.py |  13 +++++++++++++
 Misc/ACKS               |   1 +
 Misc/NEWS               |   5 +++++
 Modules/_randommodule.c |  17 +++++++++--------
 Tools/msi/msi.py        |   1 +
 10 files changed, 45 insertions(+), 10 deletions(-)
 create mode 100644 Lib/test/randv2_32.pck
 create mode 100644 Lib/test/randv2_64.pck
 create mode 100644 Lib/test/randv3.pck

diff --git a/Doc/library/random.rst b/Doc/library/random.rst
index 98054230635..07856d4c5b9 100644
--- a/Doc/library/random.rst
+++ b/Doc/library/random.rst
@@ -80,6 +80,9 @@ Bookkeeping functions:
 
    .. versionadded:: 2.1
 
+   .. versionchanged:: 2.6
+      State values produced in Python 2.6 cannot be loaded into earlier versions.
+
 
 .. function:: setstate(state)
 
diff --git a/Lib/random.py b/Lib/random.py
index ed87ddd64ee..ec0f3868b69 100644
--- a/Lib/random.py
+++ b/Lib/random.py
@@ -83,7 +83,7 @@ class Random(_random.Random):
 
     """
 
-    VERSION = 2     # used by getstate/setstate
+    VERSION = 3     # used by getstate/setstate
 
     def __init__(self, x=None):
         """Initialize an instance.
@@ -120,9 +120,20 @@ def getstate(self):
     def setstate(self, state):
         """Restore internal state from object returned by getstate()."""
         version = state[0]
-        if version == 2:
+        if version == 3:
             version, internalstate, self.gauss_next = state
             super(Random, self).setstate(internalstate)
+        elif version == 2:
+            version, internalstate, self.gauss_next = state
+            # In version 2, the state was saved as signed ints, which causes
+            #   inconsistencies between 32/64-bit systems. The state is
+            #   really unsigned 32-bit ints, so we convert negative ints from
+            #   version 2 to positive longs for version 3.
+            try:
+                internalstate = tuple( long(x) % (2**32) for x in internalstate )
+            except ValueError, e:
+                raise TypeError, e
+            super(Random, self).setstate(internalstate)
         else:
             raise ValueError("state with version %s passed to "
                              "Random.setstate() of version %s" %
diff --git a/Lib/test/randv2_32.pck b/Lib/test/randv2_32.pck
new file mode 100644
index 0000000000000000000000000000000000000000..587ab241091ec38bed3c392f618dd6bfe5cf0f47
GIT binary patch
literal 7517
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
Q{?)(!`uo@Y_4mL04~AvOG5`Po

literal 0
HcmV?d00001

diff --git a/Lib/test/randv2_64.pck b/Lib/test/randv2_64.pck
new file mode 100644
index 0000000000000000000000000000000000000000..090dd6fd196828dd107b39a963e8529cd53785ab
GIT binary patch
literal 7365
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

literal 0
HcmV?d00001

diff --git a/Lib/test/randv3.pck b/Lib/test/randv3.pck
new file mode 100644
index 0000000000000000000000000000000000000000..09fc38b1a87678a677f98daf7ba92b5dbce4489a
GIT binary patch
literal 8004
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

literal 0
HcmV?d00001

diff --git a/Lib/test/test_random.py b/Lib/test/test_random.py
index 29fe42a030e..86e2e64b5d7 100644
--- a/Lib/test/test_random.py
+++ b/Lib/test/test_random.py
@@ -140,6 +140,19 @@ def test_pickling(self):
         restoredseq = [newgen.random() for i in xrange(10)]
         self.assertEqual(origseq, restoredseq)
 
+    def test_bug_1727780(self):
+        # verify that version-2-pickles can be loaded
+        # fine, whether they are created on 32-bit or 64-bit
+        # platforms, and that version-3-pickles load fine.
+        files = [("randv2_32.pck", 780),
+                 ("randv2_64.pck", 866),
+                 ("randv3.pck", 343)]
+        for file, value in files:
+            f = open(test_support.findfile(file),"rb")
+            r = pickle.load(f)
+            f.close()
+            self.assertEqual(r.randrange(1000), value)
+
 class WichmannHill_TestBasicOps(TestBasicOps):
     gen = random.WichmannHill()
 
diff --git a/Misc/ACKS b/Misc/ACKS
index 337123a08ee..a3045f0c374 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -395,6 +395,7 @@ Marc-Andre Lemburg
 Mark Levinson
 William Lewis
 Robert van Liere
+Shawn Ligocki
 Martin Ligr
 Christopher Lindblad
 Eric Lindvall
diff --git a/Misc/NEWS b/Misc/NEWS
index 99b105874f1..a1d1160fe55 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -308,6 +308,11 @@ Core and builtins
 Library
 -------
 
+- Issue #1727780: Support loading pickles of random.Random objects created
+  on 32-bit systems on 64-bit systems, and vice versa. As a consequence
+  of the change, Random pickles created by Python 2.6 cannot be loaded
+  in Python 2.5.
+
 - Issue #1455: The distutils package now supports VS 2005 and VS 2008 for
   both the msvccompiler and cygwincompiler.
 
diff --git a/Modules/_randommodule.c b/Modules/_randommodule.c
index 25adc2e120b..e439f1e945c 100644
--- a/Modules/_randommodule.c
+++ b/Modules/_randommodule.c
@@ -319,12 +319,12 @@ random_getstate(RandomObject *self)
 	if (state == NULL)
 		return NULL;
 	for (i=0; i<N ; i++) {
-		element = PyInt_FromLong((long)(self->state[i]));
+		element = PyLong_FromUnsignedLong(self->state[i]);
 		if (element == NULL)
 			goto Fail;
 		PyTuple_SET_ITEM(state, i, element);
 	}
-	element = PyInt_FromLong((long)(self->index));
+	element = PyLong_FromLong((long)(self->index));
 	if (element == NULL)
 		goto Fail;
 	PyTuple_SET_ITEM(state, i, element);
@@ -339,7 +339,8 @@ static PyObject *
 random_setstate(RandomObject *self, PyObject *state)
 {
 	int i;
-	long element;
+	unsigned long element;
+	long index;
 
 	if (!PyTuple_Check(state)) {
 		PyErr_SetString(PyExc_TypeError,
@@ -353,16 +354,16 @@ random_setstate(RandomObject *self, PyObject *state)
 	}
 
 	for (i=0; i<N ; i++) {
-		element = PyInt_AsLong(PyTuple_GET_ITEM(state, i));
+		element = PyLong_AsUnsignedLong(PyTuple_GET_ITEM(state, i));
 		if (element == -1 && PyErr_Occurred())
 			return NULL;
-		self->state[i] = (unsigned long)element;
+		self->state[i] = element & 0xffffffffUL; /* Make sure we get sane state */
 	}
 
-	element = PyInt_AsLong(PyTuple_GET_ITEM(state, i));
-	if (element == -1 && PyErr_Occurred())
+	index = PyLong_AsLong(PyTuple_GET_ITEM(state, i));
+	if (index == -1 && PyErr_Occurred())
 		return NULL;
-	self->index = (int)element;
+	self->index = (int)index;
 
 	Py_INCREF(Py_None);
 	return Py_None;
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index c9e3a883919..5e5cb0f7835 100644
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -933,6 +933,7 @@ def add_files(db):
             lib.add_file("empty.vbs")
             lib.glob("*.uue")
             lib.glob("*.pem")
+            lib.glob("*.pck")
             lib.add_file("readme.txt", src="README")
         if dir=='decimaltestdata':
             lib.glob("*.decTest")