[json] fix json serialization for recent simplejson implementation, and test encoding of entities as with earlier simplejson implementation, iterencode internal stuff is a generated function, we can't anymore rely on the _iterencode overriding trick, so move on by stoping isinstance(Entity, dict). This is a much heavier change than expected but it was expected to be done at some point, so let's go that way.

     1

# some entities have been added before schema entities, fix the 'is' and

     2

# 'is_instance_of' relations

     3

for rtype in ('is', 'is_instance_of'):

     4

    sql('INSERT INTO %s_relation '

     5

        'SELECT X.eid, ET.cw_eid FROM entities as X, cw_CWEType as ET '

     6

        'WHERE X.type=ET.cw_name AND NOT EXISTS('

     7

        '      SELECT 1 from is_relation '

     8

        '      WHERE eid_from=X.eid AND eid_to=ET.cw_eid)' % rtype)