Merge pull request #23 from ProjetPP/fix-list-types

Fix list types w.r.t. the doc. Closes GH-22.

Author: Tpt

ppp_datamodel/nodes/list_operators.py

@@ -15,9 +15,9 @@ class ListNodeOperator(AbstractNode):
 
     def _check_attributes(self, attributes):
         super(ListNodeOperator, self)._check_attributes(attributes)
-        if not isinstance(attributes['list'], (List, Sort)):
+        if not isinstance(attributes['list'], AbstractNode):
             raise TypeError('The “list” argument of the %s constructor '
-                            'should be a List or Sort node, not %r' %
+                            'should be a node, not %r' %
                             (self.__class__.__name__, attributes['list']))
 
 class ListOperator(AbstractNode):

tests/test_list_operators.py

@@ -4,7 +4,7 @@
 from unittest import TestCase
 
 class ListOperatorTests(TestCase):
-    def testIsListNode(self):
+    def testListNodesType(self):
         d1 = {"type": "sort", "predicate": {"type": "resource", "value": "foo"},
               "list": [{"type": "resource", "value": "George Washington"},
                        {"type": "resource", "value": "Theodore Roosevelt"}]}
@@ -13,6 +13,9 @@ def testIsListNode(self):
               "list": [{"type": "resource", "value": "George Washington"},
                        {"type": "resource", "value": "Theodore Roosevelt"}]}
         AbstractNode.from_dict(d2)
+        d3 = {"type": "sort", "predicate": {"type": "resource", "value": "foo"},
+              "list": {"type": "resource", "value": "George Washington"}}
+        AbstractNode.from_dict(d3)
     def testUnion(self):
         d1 = {"type": "union",
               "list": [{"type": "resource", "value": "George Washington"},