Changeset 6245d8 in indico

Timestamp:

05/19/10 13:29:34 (3 years ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, new-webex, v0.97-series, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, d9941f8582b36b24821a11ea5ba16fda6a457fb1

Children:

460337

Parents:

9729e8

Message:

[FIX] Fossilization of PersistentList? was failing

• Changed the criteria from a set of classes to the existence of an iter method;

Files:

• indico/MaKaC/common/fossilize.py (modified) (2 diffs)
• tests/MaKaC_tests/common_tests/testFossilize.py (modified) (1 diff)

indico/MaKaC/common/fossilize.py

@@ -196 +196 @@
             if ttype in [int, str, float, NoneType]:
                 return target
-            elif ttype in [list, set, tuple]:
-                container = [] #we turn sets and tuples into lists since JSON does not have sets / tuples
-                for elem in target:
-                    container.append(fossilize(elem, interface, useAttrCache, **kwargs))
-                return container
             elif ttype is dict:
                 container = {}
@@ -206 +201 @@
                     container[key] = fossilize(value, interface, useAttrCache, **kwargs)
                 return container
-            else:
-                raise NonFossilizableException()
+            elif hasattr(target, '__iter__'):
+                #we turn sets and tuples into lists since JSON does not have sets / tuples
+                return list(fossilize(elem,
+                                      interface,
+                                      useAttrCache,
+                                      **kwargs) for elem in target)
+            else:
+                raise NonFossilizableException("Type %s is not fossilizable!" %
+                                               ttype)
 
             return fossilize(target, interface, useAttrCache)

tests/MaKaC_tests/common_tests/testFossilize.py

@@ -248 +248 @@
         s1 = SimpleClass(10, 20, 'foo')
         d1 = DerivedClass(10, 50, 'bar')
-        self.assertEquals(fossilize([s1, d1], {SimpleClass: ISimpleFossil2Fossil, DerivedClass: ISimpleFossil1Fossil}),
+        self.assertEquals(fossilize([s1, d1], {"MaKaC_tests.common_tests.testFossilize.SimpleClass": ISimpleFossil2Fossil, "MaKaC_tests.common_tests.testFossilize.DerivedClass": ISimpleFossil1Fossil}),
                           [s1.fossilize(ISimpleFossil2Fossil), d1.fossilize(ISimpleFossil1Fossil)])
-        self.assertEquals(fossilize([s1, d1], {"SimpleClass": ISimpleFossil2Fossil, "DerivedClass": ISimpleFossil1Fossil}),
-                          [s1.fossilize(ISimpleFossil2Fossil), d1.fossilize(ISimpleFossil1Fossil)])
-        self.assertEquals(fossilize([s1, d1], {"MaKaC_tests.common_tests.testFossilize.SimpleClass": ISimpleFossil2Fossil,
-                                               "MaKaC_tests.common_tests.testFossilize.DerivedClass": ISimpleFossil1Fossil}),
-                          [s1.fossilize(ISimpleFossil2Fossil), d1.fossilize(ISimpleFossil1Fossil)])
-        self.assertEquals(fossilize([s1, d1], {SimpleClass: ISimpleFossil2Fossil}),
-                          [s1.fossilize(ISimpleFossil2Fossil), d1.fossilize(ISimpleFossil2Fossil)])