Changeset 2438

Timestamp:

06/01/09 09:45:19 (10 months ago)

Author:

nick

Message:

Removed dependancy for fpconst for pure python

Location:

pyamf/branches/remove-fpconst-564/pyamf

Files:

• tests/test_platform.py (added)
• tests/util.py (modified) (2 diffs)
• util/__init__.py (modified) (6 diffs)

pyamf/branches/remove-fpconst-564/pyamf/tests/util.py

@@ -13 +13 @@
 import pyamf
 from pyamf.util import BufferedByteStream, is_float_broken
+
+PosInf = 1e300000
+NegInf = -1e300000
+NaN = PosInf / PosInf
 
 
@@ -111 +115 @@
 
 def isNaN(val):
-    if is_float_broken():
-        import fpconst
-
-        return fpconst.isNaN(val)
-    else:
-        return str(float(val)) == str(1e300000/1e300000)
+    return str(float(val)) == str(NaN)
 
 
 def isPosInf(val):
-    if is_float_broken():
-        import fpconst
-
-        return fpconst.isPosInf(val)
-    else:
-        return val == 1e300000
+    return str(float(val)) == str(PosInf)
 
 
 def isNegInf(val):
-    if is_float_broken():
-        import fpconst
-
-        return fpconst.isNegInf(val)
-    else:
-        return val == -1e300000
+    return str(float(val)) == str(NegInf)
 
 

pyamf/branches/remove-fpconst-564/pyamf/util/__init__.py

@@ -21 +21 @@
 except ImportError:
     from StringIO import StringIO
+
 
 xml_types = None
@@ -42 +43 @@
 int_types = tuple(int_types)
 str_types = tuple(str_types)
+
+PosInf = 1e300000
+NegInf = -1e300000
+# we do this instead of float('nan') because windows throws a wobbler.
+NaN = PosInf / PosInf
 
 
@@ -911 +917 @@
     @rtype: C{bool}
     """
-    # we do this instead of float('nan') because windows throws a wobbler.
-    nan = 1e300000/1e300000
-
-    return str(nan) != str(struct.unpack("!d", '\xff\xf8\x00\x00\x00\x00\x00\x00')[0])
+    global NaN
+
+    return str(NaN) != str(struct.unpack("!d", '\xff\xf8\x00\x00\x00\x00\x00\x00')[0])
+
+
+def isNaN(val):
+    return str(float(val)) == str(NaN)
+
+
+def isPosInf(val):
+    return str(float(val)) == str(PosInf)
+
+
+def isNegInf(val):
+    return str(float(val)) == str(NegInf)
 
 
@@ -927 +944 @@
 
 if is_float_broken():
-    import fpconst
-
     def read_double_workaround(self):
+        global PosInf, NegInf, NaN
+
         bytes = self.read(8)
 
         if self._is_big_endian():
             if bytes == '\xff\xf8\x00\x00\x00\x00\x00\x00':
-                return fpconst.NaN
+                return NaN
 
             if bytes == '\xff\xf0\x00\x00\x00\x00\x00\x00':
-                return fpconst.NegInf
+                return NegInf
 
             if bytes == '\x7f\xf0\x00\x00\x00\x00\x00\x00':
-                return fpconst.PosInf
+                return PosInf
         else:
             if bytes == '\x00\x00\x00\x00\x00\x00\xf8\xff':
-                return fpconst.NaN
+                return NaN
 
             if bytes == '\x00\x00\x00\x00\x00\x00\xf0\xff':
-                return fpconst.NegInf
+                return NegInf
 
             if bytes == '\x00\x00\x00\x00\x00\x00\xf0\x7f':
-                return fpconst.PosInf
+                return PosInf
 
         return struct.unpack("%sd" % self.endian, bytes)[0]
@@ -959 +976 @@
             raise TypeError('expected a float (got:%r)' % (type(d),))
 
-        if fpconst.isNaN(d):
+        if isNaN(d):
             if self._is_big_endian():
                 self.write('\xff\xf8\x00\x00\x00\x00\x00\x00')
             else:
                 self.write('\x00\x00\x00\x00\x00\x00\xf8\xff')
-        elif fpconst.isNegInf(d):
+        elif isNegInf(d):
             if self._is_big_endian():
                 self.write('\xff\xf0\x00\x00\x00\x00\x00\x00')
             else:
                 self.write('\x00\x00\x00\x00\x00\x00\xf0\xff')
-        elif fpconst.isPosInf(d):
+        elif isPosInf(d):
             if self._is_big_endian():
                 self.write('\x7f\xf0\x00\x00\x00\x00\x00\x00')
@@ -980 +997 @@
     DataTypeMixIn.write_double = write_double_workaround
     write_double_workaround.old_func = x
+
 
 try: