Commits

Dario Bertini  committed 313a607

Small cleanup (eg test_all.py)
Changed the int argtype in opimpl

  • Participants
  • Parent commits b5bba8d
  • Branches win64 test

Comments (0)

Files changed (3)

File pypy/rlib/rarithmetic.py

     n &= LONG_MASK
     if n >= LONG_TEST:
         n -= 2*LONG_TEST
-    # return int(n)
     return n
 
 def longlongmask(n):
     assert not isinstance(r, r_uint), "unexpected ovf check on unsigned"
     assert not isinstance(r, r_longlong), "ovfcheck not supported on r_longlong"
     assert not isinstance(r,r_ulonglong),"ovfcheck not supported on r_ulonglong"
-    # if type(r) is long:
     if abs(r) > sys.maxint:
         raise OverflowError, "signed integer expression did overflow"
     return r

File pypy/rpython/lltypesystem/opimpl.py

     r_longlong_result = r_longlong
 
 argtype_by_name = {
-    'int': long, # XXX int,
+    'int': (int, long),
     'float': float,
     'uint': r_uint,
     'llong': r_longlong_arg,

File pypy/test_all.py

-import sys
-sys.orig_maxint = sys.maxint
-sys.maxint = 2**63-1
-
 #! /usr/bin/env python
 """
 PyPy Test runner interface
 For more information, use test_all.py -h.
 """
 import sys, os
+sys.orig_maxint = sys.maxint
+sys.maxint = 2**63-1
+
 
 if len(sys.argv) == 1 and os.path.dirname(sys.argv[0]) in '.':
     print >> sys.stderr, __doc__