klass comparison hopefully improved

Author: nlgio

MiddleKit/Core/Klass.py

@@ -366,17 +366,15 @@ def __str__(self):
     def __hash__(self):
         return hash(self.name())  # | hash(self.model().name())
 
-    def __cmp__(self, other):
-        if other is None:
-            return 1
-        if not isinstance(other, Klass):
-            return 1
-        if self.model() is not other.model():
-            value = cmp(self.model().name(), other.model().name())
-            if value == 0:
-                value = cmp(self.name(), other.name())
-            return value
-        return cmp(self.name(), other.name())
+    def __eq__(self, other):
+        if other is None or not isinstance(other, Klass):
+            return False
+        #if self.model() is not other.model():
+        #    value = cmp(self.model().name(), other.model().name())
+        #    if value == 0:
+        #        value = cmp(self.name(), other.name())
+        #    return value
+        return self.name() == other.name()
 
 
     ## Warnings ##

MiddleKit/Run/ObjectKey.py

@@ -41,7 +41,7 @@ def serialNum(self):
     #    return result
     def __eq__(self, other ):
         return self._className == other._className and self._serialNum == other._serialNum
-
+    #according to http://python3porting.com/preparing.html hash will then be set to None automatically
     def __hash__(self):
         return hash(self._className) ^ hash(self._serialNum)
 

MiddleKit/Tests/MKBackRef.mkmodel/TestSamples.py

@@ -5,5 +5,5 @@ def test(store):
     for n in nodes:
         children = n.children()
         if children:
-            children.sort(key=lambda c: c.serialNum)
+            sorted(children, key=lambda c: c.serialNum() )
             assert n.value() == ''.join([c.value() for c in children])

MiddleKit/Tests/Test.py

@@ -79,6 +79,7 @@ def readArgs(self, args):
                 MKBasic MKNone MKString MKDateTime MKEnums MKDefaultMinMax
                 MKTypeValueChecking MKInheritance MKInheritanceAbstract
                 MKList MKObjRef MKObjRefReuse MKDelete MKDeleteMark
+                  MKBackRef MKClone MKDump MKRefresh
                 MKMultipleStores MKMultipleThreads
                 MKModelInh1 MKModelInh2 MKModelInh3
                 MKExcel