[pypy-svn] r76090 - in pypy/branch/fast-forward/pypy: objspace/std rlib/rstruct

[benjamin at codespeak.net]

Author: benjamin
Date: Sat Jul 10 18:39:12 2010
New Revision: 76090

Modified:
   pypy/branch/fast-forward/pypy/objspace/std/floatobject.py
   pypy/branch/fast-forward/pypy/objspace/std/floattype.py
   pypy/branch/fast-forward/pypy/rlib/rstruct/nativefmttable.py
   pypy/branch/fast-forward/pypy/rlib/rstruct/standardfmttable.py
Log:
use rarithmetic.INFINITY instead of float('inf')

Modified: pypy/branch/fast-forward/pypy/objspace/std/floatobject.py
==============================================================================
--- pypy/branch/fast-forward/pypy/objspace/std/floatobject.py	(original)
+++ pypy/branch/fast-forward/pypy/objspace/std/floatobject.py	Sat Jul 10 18:39:12 2010
@@ -9,7 +9,8 @@
 from pypy.objspace.std.noneobject import W_NoneObject
 from pypy.objspace.std.longobject import W_LongObject
 from pypy.rlib.rarithmetic import ovfcheck_float_to_int, intmask, isinf, isnan
-from pypy.rlib.rarithmetic import formatd, LONG_BIT, FL_MAXINT, FL_MININT
+from pypy.rlib.rarithmetic import (formatd, LONG_BIT, FL_MAXINT, FL_MININT,
+                                   INFINITY)
 from pypy.rlib.rbigint import rbigint
 from pypy.rlib.objectmodel import we_are_translated
 from pypy.rlib import rfloat
@@ -438,7 +439,7 @@
         elif x == 0.0:
             if y < 0.0:
                 if isinf(y):
-                    return space.wrap(float("inf"))
+                    return space.wrap(INFINITY)
                 raise OperationError(space.w_ZeroDivisionError,
                                      space.wrap("0.0 cannot be raised to "
                                                 "a negative power"))

Modified: pypy/branch/fast-forward/pypy/objspace/std/floattype.py
==============================================================================
--- pypy/branch/fast-forward/pypy/objspace/std/floattype.py	(original)
+++ pypy/branch/fast-forward/pypy/objspace/std/floattype.py	Sat Jul 10 18:39:12 2010
@@ -1,7 +1,7 @@
 import math
 import sys
 from pypy.rlib.unroll import unrolling_iterable
-from pypy.rlib import rfloat
+from pypy.rlib import rfloat, rarithmetic
 from pypy.interpreter import gateway
 from pypy.interpreter.baseobjspace import ObjSpace, W_Root
 from pypy.interpreter.error import OperationError
@@ -99,7 +99,7 @@
         i += 1
         if length - i >= 2 and s[i:i + 2].lower() == "nf":
             i += 2
-            value = float("inf")
+            value = rarithmetic.INFINITY
             if length - i >= 5 and s[i:i + 5].lower() == "inity":
                 i += 5
     elif s[i] == "n" or s[i] == "N":

Modified: pypy/branch/fast-forward/pypy/rlib/rstruct/nativefmttable.py
==============================================================================
--- pypy/branch/fast-forward/pypy/rlib/rstruct/nativefmttable.py	(original)
+++ pypy/branch/fast-forward/pypy/rlib/rstruct/nativefmttable.py	Sat Jul 10 18:39:12 2010
@@ -128,7 +128,7 @@
             unpack = unpack_bool
         else:
             cpython_checks_range = fmtchar in 'bBhH'
-            pack = std.make_int_packer(size, signed, cpython_checks_range)
+            pack = std.make_int_packer(size, signed, True)
             unpack = std.make_int_unpacker(size, signed)
 
         native_fmttable[fmtchar] = {'size': size,

Modified: pypy/branch/fast-forward/pypy/rlib/rstruct/standardfmttable.py
==============================================================================
--- pypy/branch/fast-forward/pypy/rlib/rstruct/standardfmttable.py	(original)
+++ pypy/branch/fast-forward/pypy/rlib/rstruct/standardfmttable.py	Sat Jul 10 18:39:12 2010
@@ -238,9 +238,8 @@
 
 for c, size in [('b', 1), ('h', 2), ('i', 4), ('l', 4), ('q', 8)]:
     standard_fmttable[c] = {'size': size,
-                            'pack': make_int_packer(size, True, False),
+                            'pack': make_int_packer(size, True, True),
                             'unpack': make_int_unpacker(size, True)}
     standard_fmttable[c.upper()] = {'size': size,
-                                    'pack': make_int_packer(size, False,
-                                                            False),
+                                    'pack': make_int_packer(size, False, True),
                                     'unpack': make_int_unpacker(size, False)}