From 49c15d4a5fa139bf2d154112709a8b29c9d5d678 Mon Sep 17 00:00:00 2001 From: Larry Hastings Date: Sun, 24 Jun 2012 01:54:21 -0700 Subject: [PATCH] Issue #14815: Use Py_ssize_t instead of long for the object hash, to preserve all 64 bits of hash on Win64. --- Misc/NEWS | 3 +++ Modules/_randommodule.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS index c429412788b..3a07f03fdc7 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -10,6 +10,9 @@ What's New in Python 3.3.0 Beta 1? Core and Builtins ----------------- +- Issue #14815: Use Py_ssize_t instead of long for the object hash, to + preserve all 64 bits of hash on Win64. + - Issue #12268: File readline, readlines and read() or readall() methods no longer lose data when an underlying read system call is interrupted. IOError is no longer raised due to a read system call returning EINTR diff --git a/Modules/_randommodule.c b/Modules/_randommodule.c index 3c7d70083a9..52530e6154b 100644 --- a/Modules/_randommodule.c +++ b/Modules/_randommodule.c @@ -234,10 +234,10 @@ random_seed(RandomObject *self, PyObject *args) if (PyLong_Check(arg)) n = PyNumber_Absolute(arg); else { - long hash = PyObject_Hash(arg); + Py_ssize_t hash = PyObject_Hash(arg); if (hash == -1) goto Done; - n = PyLong_FromUnsignedLong((unsigned long)hash); + n = PyLong_FromSsize_t(hash); } if (n == NULL) goto Done;