Changeset 1146

Timestamp:

03/25/08 02:32:07 (2 years ago)

Author:

nick

Message:

Fixed failing tests ..

Location:

pyamf/trunk/pyamf

Files:

• amf0.py (modified) (1 diff)
• tests/test_amf0.py (modified) (1 diff)
• tests/test_util.py (modified) (2 diffs)
• util.py (modified) (3 diffs)

pyamf/trunk/pyamf/amf0.py

@@ -221 +221 @@
         @rtype: C{int} or C{float}
         """
-        x = self.stream.read_double()
-
-        return _check_for_int(x)
+        return _check_for_int(self.stream.read_double())
 
     def readBoolean(self):

pyamf/trunk/pyamf/tests/test_amf0.py

@@ -499 +499 @@
         self.buf.seek(0)
         x = self.decoder.readElement()
-
         self.assertTrue(fpconst.isNaN(x))
 

pyamf/trunk/pyamf/tests/test_util.py

@@ -273 +273 @@
         util.StringIOProxy._wrapped_class = StringIO
 
-class ByteStream(util.StringIOProxy, util.NetworkIOMixIn):
+class ByteStream(util.StringIOProxy, util.DataTypeMixIn):
     pass
 
@@ -415 +415 @@
         x = ByteStream()
 
-        self._write_endian(x, x.write_utf8_string, (u'ᚠᛇᚻ',), (
-            '\xe1\x9a\xa0\xe1\x9b\x87\xe1\x9a\xbb', '\xe1\x9a\xa0\xe1\x9b\x87\xe1\x9a\xbb'))
+        self._write_endian(x, x.write_utf8_string, (u'ᚠᛇᚻ',), ['\xe1\x9a\xa0\xe1\x9b\x87\xe1\x9a\xbb'] * 2)
 
     def test_read_utf8_string(self):

pyamf/trunk/pyamf/util.py

@@ -532 +532 @@
 import fpconst
 
-fp = struct.unpack("!d", '\xff\xf8\x00\x00\x00\x00\x00\x00')[0]
-
-if not fpconst.isNaN(fp):
-    def read_float_workaround(self):
+if not fpconst.isNaN(struct.unpack("!d", '\xff\xf8\x00\x00\x00\x00\x00\x00')[0]):
+    def read_double_workaround(self):
         bytes = self._read(8)
 
@@ -547 +545 @@
             return fpconst.PosInf
 
-        return struct.unpack("!d", bytes)[0]
-
-    NetworkIOMixIn.read_double = read_float_workaround
-
-    def write_float_workaround(self, d):
+        return struct.unpack("%sd" % self.endian, bytes)[0]
+
+    DataTypeMixIn.read_double = read_double_workaround
+
+    def write_double_workaround(self, d):
         if fpconst.isNaN(d):
             self.write('\xff\xf8\x00\x00\x00\x00\x00\x00')
@@ -559 +557 @@
             self.write('\x7f\xf0\x00\x00\x00\x00\x00\x00')
         else:
-            write_float_workaround.old_func(self, d)
-
-    x = NetworkIOMixIn.write_double
-    NetworkIOMixIn.write_double = write_float_workaround
-    write_float_workaround.old_func = x
-
-del fp
+            write_double_workaround.old_func(self, d)
+
+    x = DataTypeMixIn.write_double
+    DataTypeMixIn.write_double = write_double_workaround
+    write_double_workaround.old_func = x