# HG changeset patch # User Sylvain Thénault # Date 1268128435 -3600 # Node ID c02a340cd1da5580f8c0b7137c58bc12cf0eaa94 # Parent f482dbdf2f8c9ad1c6c6cfbdc7bd4d8ca3453200 cleanup diff -r f482dbdf2f8c -r c02a340cd1da hooks/test/unittest_syncschema.py --- a/hooks/test/unittest_syncschema.py Tue Mar 09 10:53:38 2010 +0100 +++ b/hooks/test/unittest_syncschema.py Tue Mar 09 10:53:55 2010 +0100 @@ -281,7 +281,7 @@ 'WHERE E is CWEType, E name "Email", A is CWAttribute,' 'A from_entity E, A relation_type R, R name "subject"') self.commit() - rset = req.execute('Any X Where X has_text "rick.roll"') + rset = req.execute('Any X WHERE X has_text "rick.roll"') self.failIf(rset) assert req.execute('SET A fulltextindexed TRUE ' 'WHERE A from_entity E, A relation_type R, ' @@ -300,7 +300,7 @@ assert self.execute('SET R fulltext_container NULL ' 'WHERE R name "use_email"') self.commit() - rset = self.execute('Any X Where X has_text "rick.roll"') + rset = self.execute('Any X WHERE X has_text "rick.roll"') self.assertIn(target.eid, [item[0] for item in rset]) assert self.execute('SET R fulltext_container "subject" ' 'WHERE R name "use_email"') diff -r f482dbdf2f8c -r c02a340cd1da server/hookhelper.py --- a/server/hookhelper.py Tue Mar 09 10:53:38 2010 +0100 +++ b/server/hookhelper.py Tue Mar 09 10:53:55 2010 +0100 @@ -13,7 +13,6 @@ @deprecated('[3.6] entity_oldnewvalue should be imported from cw.server.hook') def entity_oldnewvalue(entity, attr): - """return the "name" attribute of the entity with the given eid""" return hook.entity_oldnewvalue(entity, attr) @deprecated('[3.6] entity_name is deprecated, use entity.name')