Changeset 1157

Timestamp:

04/10/08 19:32:23 (2 years ago)

Author:

nick

Message:

Applying patch from buge. Fixes #241, Thanks!

Location:

pyamf/trunk/pyamf

Files:

• amf3.py (modified) (11 diffs)
• tests/test_amf3.py (modified) (4 diffs)

pyamf/trunk/pyamf/amf3.py

@@ -861 +861 @@
         ASTypes.BOOL_FALSE: 'readBoolFalse',
         ASTypes.BOOL_TRUE:  'readBoolTrue',
-        ASTypes.INTEGER:    'readInteger',
+        ASTypes.INTEGER:    'readSignedInteger',
         ASTypes.NUMBER:     'readNumber',
         ASTypes.STRING:     'readString',
@@ -926 +926 @@
         return self.stream.read_double()
 
-    def readInteger(self):
+    def readUnsignedInteger(self):
+        """
+        Reads and returns an unsigned integer from the stream.
+        """
+        return self.readInteger(False)
+
+    def readSignedInteger(self):
+        """
+        Reads and returns a signed integer from the stream.
+        """
+        return self.readInteger(True)
+
+    def readInteger(self, signed=False):
         """
         Reads and returns an integer from the stream.
@@ -951 +963 @@
 
             if result & 0x10000000 != 0:
-                result <<= 1
-                result += 1
+                if signed:
+                    result -= 0x20000000
+                else:
+                    result <<= 1
+                    result += 1
 
         return result
@@ -964 +979 @@
         """
         def readLength():
-            x = self.readInteger()
+            x = self.readUnsignedInteger()
 
             return (x >> 1, x & REFERENCE_BIT == 0)
@@ -987 +1002 @@
         The timezone is ignored as the date is always in UTC.
         """
-        ref = self.readInteger()
+        ref = self.readUnsignedInteger()
 
         if ref & REFERENCE_BIT == 0:
@@ -1010 +1025 @@
         <http://www.docuverse.com/blog/donpark/2007/05/14/flash-9-amf3-bug>}
         """
-        size = self.readInteger()
+        size = self.readUnsignedInteger()
 
         if size & REFERENCE_BIT == 0:
@@ -1084 +1099 @@
                 attr = self.readString()
 
-        ref = self.readInteger()
+        ref = self.readUnsignedInteger()
 
         if ref & REFERENCE_BIT == 0:
@@ -1130 +1145 @@
         @param legacy: The read XML is in 'legacy' format.
         """
-        ref = self.readInteger()
+        ref = self.readUnsignedInteger()
 
         if ref & REFERENCE_BIT == 0:
@@ -1172 +1187 @@
         @note: This is not supported in ActionScript 1.0 and 2.0.
         """
-        ref = self.readInteger()
+        ref = self.readUnsignedInteger()
 
         if ref & REFERENCE_BIT == 0:
@@ -1307 +1322 @@
         @param  use_references:
         """
-        if n > 0x3fffffff:
+        if n & 0xf0000000 not in [0, 0xf0000000]:
             self.writeNumber(n)
 
@@ -1717 +1732 @@
 
 def _encode_int(n):
-    if n > 0x40000000:
+    if n & 0xf0000000 not in [0, 0xf0000000]:
         raise ValueError, "Out of range"
 
     bytes = ''
     real_value = None
+
+    if n < 0:
+        n += 0x20000000
 
     if n > 0x1fffff:

pyamf/trunk/pyamf/tests/test_amf3.py

@@ -299 +299 @@
     def test_integer(self):
         self._run([(0, '\x04\x00')])
+        self._run([(0x35, '\x04\x35')])
         self._run([(0x7f, '\x04\x7f')])
         self._run([(0x80, '\x04\x81\x00')])
+        self._run([(0xd4, '\x04\x81\x54')])
         self._run([(0x3fff, '\x04\xff\x7f')])
         self._run([(0x4000, '\x04\x81\x80\x00')])
+        self._run([(0x1a53f, '\x04\x86\xca\x3f')])
         self._run([(0x1fffff, '\x04\xff\xff\x7f')])
         self._run([(0x200000, '\x04\x80\xc0\x80\x00')])
-        self._run([(0x3fffffff, '\x04\xff\xff\xff\xff')])
+        self._run([(-0x01, '\x04\xff\xff\xff\xff')])
+        self._run([(-0x2a, '\x04\xff\xff\xff\xd6')])
+        self._run([(0xfffffff, '\x04\xbf\xff\xff\xff')])
+        self._run([(-0x10000000, '\x04\xc0\x80\x80\x00')])
+        self._run([(0x10000000, '\x05\x41\xb0\x00\x00\x00\x00\x00\x00')])
+        self._run([(-0x10000001, '\x05\xc1\xb0\x00\x00\x01\x00\x00\x00')])
 
     def test_number(self):
@@ -331 +339 @@
 
         self.encoder.writeString(UnicodeObject())
-        self.assertEquals(self.buf.getvalue(), '\x06+M\xc3\x83\xc3\x82\xc2\xb6tley Cr\xc3\x83\xc3\x82\xc2\xbce')
+        self.assertEquals(self.buf.getvalue(), '\x06+M\xc3\x83\xc3\x82\xc2'
+            '\xb6tley Cr\xc3\x83\xc3\x82\xc2\xbce')
         self.buf.truncate()
         self.context.clear()
 
         self.encoder.writeString(StrObject())
-        self.assertEquals(self.buf.getvalue(), '\x06+M\xc3\x83\xc3\x82\xc2\xb6tley Cr\xc3\x83\xc3\x82\xc2\xbce')
+        self.assertEquals(self.buf.getvalue(), '\x06+M\xc3\x83\xc3\x82\xc2'
+            '\xb6tley Cr\xc3\x83\xc3\x82\xc2\xbce')
         self.buf.truncate()
         self.context.clear()
 
         self.encoder.writeString(ReprObject())
-        self.assertEquals(self.buf.getvalue(), '\x06+M\xc3\x83\xc3\x82\xc2\xb6tley Cr\xc3\x83\xc3\x82\xc2\xbce')
+        self.assertEquals(self.buf.getvalue(), '\x06+M\xc3\x83\xc3\x82\xc2'
+            '\xb6tley Cr\xc3\x83\xc3\x82\xc2\xbce')
         self.buf.truncate()
         self.context.clear()
 
-        self.encoder.writeString('M\xc3\x83\xc3\x82\xc2\xb6tley Cr\xc3\x83\xc3\x82\xc2\xbce')
-        self.assertEquals(self.buf.getvalue(), '\x06+M\xc3\x83\xc3\x82\xc2\xb6tley Cr\xc3\x83\xc3\x82\xc2\xbce')
+        self.encoder.writeString('M\xc3\x83\xc3\x82\xc2\xb6tley Cr\xc3\x83'
+            '\xc3\x82\xc2\xbce')
+        self.assertEquals(self.buf.getvalue(), '\x06+M\xc3\x83\xc3\x82\xc2'
+            '\xb6tley Cr\xc3\x83\xc3\x82\xc2\xbce')
 
 
@@ -619 +632 @@
     def test_integer(self):
         self._run([(0, '\x04\x00')])
+        self._run([(0x35, '\x04\x35')])
         self._run([(0x7f, '\x04\x7f')])
         self._run([(0x80, '\x04\x81\x00')])
+        self._run([(0xd4, '\x04\x81\x54')])
         self._run([(0x3fff, '\x04\xff\x7f')])
         self._run([(0x4000, '\x04\x81\x80\x00')])
+        self._run([(0x1a53f, '\x04\x86\xca\x3f')])
         self._run([(0x1fffff, '\x04\xff\xff\x7f')])
         self._run([(0x200000, '\x04\x80\xc0\x80\x00')])
-        self._run([(0x3fffffff, '\x04\xff\xff\xff\xff')])
+        self._run([(-0x01, '\x04\xff\xff\xff\xff')])
+        self._run([(-0x2a, '\x04\xff\xff\xff\xd6')])
+        self._run([(0xfffffff, '\x04\xbf\xff\xff\xff')])
+        self._run([(-0x10000000, '\x04\xc0\x80\x80\x00')])
+
+    def test_unsignedInteger(self):
+        tests = [
+            (0, '\x00'),
+            (0x7f, '\x7f'),
+            (0x80, '\x81\x00'),
+            (0x3fff, '\xff\x7f'),
+            (0x4000, '\x81\x80\x00'),
+            (0x1fffff, '\xff\xff\x7f'),
+            (0x200000, '\x80\xc0\x80\x00'),
+            (0x3fffffff, '\xff\xff\xff\xff')
+        ]
+
+        for n, s in tests:
+            self.buf.truncate(0)
+            self.buf.write(s)
+            self.buf.seek(0)
+            self.assertEqual(self.decoder.readUnsignedInteger(), n)
 
     def test_infinites(self):
@@ -996 +1033 @@
         self.assertEquals(id(obj1), id(obj2))
 
-    def test_class_references(self):
-        pass
-
     def test_static(self):
         pyamf.register_class(Spam, 'abc.xyz')