merge stable
authorSylvain Thénault <sylvain.thenault@logilab.fr>
Fri, 28 Aug 2009 14:15:18 +0200
branchstable
changeset 3049 cb13d9b6c29e
parent 3047 ba86b1bdbcab (diff)
parent 3048 84c3e8f7e0cb (current diff)
child 3050 f4c1994a749d
child 3053 51f196c212d9
merge
--- a/entity.py	Fri Aug 28 13:21:12 2009 +0200
+++ b/entity.py	Fri Aug 28 14:15:18 2009 +0200
@@ -315,7 +315,7 @@
     def __hash__(self):
         return id(self)
 
-    def __cmp__(self):
+    def __cmp__(self, other):
         raise NotImplementedError('comparison not implemented for %s' % self.__class__)
 
     def pre_add_hook(self):