Add back type check on variable entity

openfisca_core/variables.py

@@ -10,6 +10,7 @@
 from datetime import date
 
 from openfisca_core import periods
+from openfisca_core.entities import Entity
 from openfisca_core.indexed_enums import Enum, EnumArray, ENUM_ARRAY_DTYPE
 from openfisca_core.periods import DAY, MONTH, YEAR, ETERNITY
 from openfisca_core.tools import eval_expression
@@ -210,11 +211,8 @@ def set(self, attributes, attribute_name, required = False, allowed_values = Non
         return value
 
     def set_entity(self, entity):
-        # TODO - isinstance() won't work due to use of load_module to load tax_benefit_system
-        # Just trust the input in the meantime
-        # if not isinstance(entity, entities.Entity):
-        #     raise ValueError("Invalid value '{}' for attribute 'entity' in variable '{}'. Must be an instance of Entity."
-        #     .format(entity, self.name).encode('utf-8'))
+        if not isinstance(entity, Entity):
+            raise ValueError(f"Invalid value '{entity}' for attribute 'entity' in variable '{self.name}'. Must be an instance of Entity.")
         return entity
 
     def set_possible_values(self, possible_values):

tests/core/test_simulation_builder.py

@@ -43,7 +43,7 @@ def int_variable(persons):
     class intvar(Variable):
         definition_period = ETERNITY
         value_type = int
-        entity = persons.__class__
+        entity = persons
 
         def __init__(self):
             super().__init__()
@@ -57,7 +57,7 @@ def date_variable(persons):
     class datevar(Variable):
         definition_period = ETERNITY
         value_type = date
-        entity = persons.__class__
+        entity = persons
 
         def __init__(self):
             super().__init__()