[pypy-svn] r76026 - in pypy/branch/interplevel-array: . lib-python lib_pypy lib_pypy/pypy_test pypy/module/array pypy/module/test_lib_pypy/ctypes_tests pypy/rlib

[hakanardo at codespeak.net]

Author: hakanardo
Date: Thu Jul  8 15:47:36 2010
New Revision: 76026

Modified:
   pypy/branch/interplevel-array/   (props changed)
   pypy/branch/interplevel-array/lib-python/   (props changed)
   pypy/branch/interplevel-array/lib_pypy/   (props changed)
   pypy/branch/interplevel-array/lib_pypy/dbm.py   (props changed)
   pypy/branch/interplevel-array/lib_pypy/pypy_test/test_functools.py   (props changed)
   pypy/branch/interplevel-array/pypy/module/array/interp_array_try1.py   (props changed)
   pypy/branch/interplevel-array/pypy/module/test_lib_pypy/ctypes_tests/   (props changed)
   pypy/branch/interplevel-array/pypy/rlib/rarithmetic.py
Log:
svn merge -r76012:76023  svn+ssh://hakanardo@codespeak.net/svn/pypy/trunk

Modified: pypy/branch/interplevel-array/pypy/rlib/rarithmetic.py
==============================================================================
--- pypy/branch/interplevel-array/pypy/rlib/rarithmetic.py	(original)
+++ pypy/branch/interplevel-array/pypy/rlib/rarithmetic.py	Thu Jul  8 15:47:36 2010
@@ -118,7 +118,7 @@
         result = int(int(x))  # -2147483648.0 => -2147483648L => -2147483648
     except (OverflowError, ValueError): # ValueError for int(nan) on Py>=2.6
         raise OverflowError
-    if type(result) is not int:
+    if not objectmodel.we_are_translated() and type(result) is not int:
         raise OverflowError
     return result