cleanup stable
authorSylvain Thénault <sylvain.thenault@logilab.fr>
Tue, 09 Mar 2010 10:53:55 +0100
branchstable
changeset 4840 c02a340cd1da
parent 4839 f482dbdf2f8c
child 4841 0b9a842ec4f7
cleanup
hooks/test/unittest_syncschema.py
server/hookhelper.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"')
--- 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')