[pypy-commit] pypy py3k-newhash: merge py3k

[pjenvey]

Author: Philip Jenvey <pjenvey at underboss.org>
Branch: py3k-newhash
Changeset: r63950:925322f499da
Date: 2013-05-09 11:55 -0700
http://bitbucket.org/pypy/pypy/changeset/925322f499da/

Log:	merge py3k

diff --git a/lib_pypy/ctypes_config_cache/dumpcache.py b/lib_pypy/ctypes_config_cache/dumpcache.py
--- a/lib_pypy/ctypes_config_cache/dumpcache.py
+++ b/lib_pypy/ctypes_config_cache/dumpcache.py
@@ -11,7 +11,7 @@
     g = open(filename, 'w')
     print >> g, '''\
 import sys
-_size = 32 if sys.maxint <= 2**32 else 64
+_size = 32 if sys.maxsize <= 2**32 else 64
 # XXX relative import, should be removed together with
 # XXX the relative imports done e.g. by lib_pypy/pypy_test/test_hashlib
 _mod = __import__("_%s_%%s_" %% (_size,),
diff --git a/pypy/module/_random/test/test_random.py b/pypy/module/_random/test/test_random.py
--- a/pypy/module/_random/test/test_random.py
+++ b/pypy/module/_random/test/test_random.py
@@ -46,7 +46,7 @@
         rnd = _random.Random()
         rnd.seed()
         different_nums = []
-        mask = sys.maxint * 2 + 1
+        mask = sys.maxsize * 2 + 1
         for obj in ["spam and eggs", 3.14, 1+2j, 'a', tuple('abc')]:
             nums = []
             for o in [obj, hash(obj) & mask, -(hash(obj) & mask)]: