Changeset 1493

Timestamp:

07/09/08 10:48:41 (3 months ago)

Author:

nick

Message:

amf3.Encoder now raises an exception when encountering a func or method type

Location:

pyamf/branches/amf3-encoder-unsupported-311/pyamf

Files:

• amf3.py (modified) (3 diffs)
• tests/test_amf3.py (modified) (2 diffs)

pyamf/branches/amf3-encoder-unsupported-311/pyamf/amf3.py

@@ -1204 +1204 @@
         # Unsupported types go first
         ((types.BuiltinFunctionType, types.BuiltinMethodType,),
-            "writeUnsupported"),
+            "writeFunc"),
         ((bool,), "writeBoolean"),
         ((types.NoneType,), "writeNull"),
@@ -1217 +1217 @@
     ]
 
+    def writeFunc(self, obj):
+        """
+        Functions are unencodeable ..
+        """
+        raise pyamf.EncodeError("Unable to encode function/methods")
+
     def writeElement(self, data, use_references=True):
         """
@@ -1230 +1236 @@
 
         if func is None:
-            # XXX nick: Should we be generating a warning here?
-            self.writeUnsupported(data)
+            raise pyamf.EncodeError("Cannot find encoder func for %r" % (data,))
         else:
             try:

pyamf/branches/amf3-encoder-unsupported-311/pyamf/tests/test_amf3.py

@@ -267 +267 @@
             self._run([(ord, '\x00')])
 
-        self.assertRaises(AttributeError, x)
+        self.assertRaises(pyamf.EncodeError, x)
 
         self._run([(pyamf.Undefined, '\x00')])
@@ -583 +583 @@
             '\n\x0b\x01\ttext\x06\x07bar\ttail\x01\x07tag\x06\x07foo\x01')
 
+    def test_unknown_func(self):
+        self.encoder._writeElementFunc = lambda x: None
+
+        self.assertRaises(pyamf.EncodeError, self.encoder.writeElement, None)
+
 class DecoderTestCase(_util.ClassCacheClearingTestCase):
     """