Changeset 1d57031 in indico

Timestamp:

03/16/11 17:25:07 (2 years ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, 0da0c1403bae8e51d8229f460181c71b9e6dda72

Children:

9364f6

Parents:

bb29fc

Message:

[FIX] OOTreeSet sorting

Files:

• bin/migration/migrate_0.97_0.98.py (modified) (1 diff)
• indico/MaKaC/conference.py (modified) (3 diffs)

bin/migration/migrate_0.97_0.98.py

@@ -231 +231 @@
         categ.conferences = OOTreeSet(categ.conferences.values())
         if len(categ.conferences) != len(categ.conferencesBackup):
-            print categ.getId()
+            print "Problem migrating conf dict to tree set: %s" % categ.getId()
 
 

indico/MaKaC/conference.py

@@ -1130 +1130 @@
             sortType=3--> Alphabetically - Reversed
         """
-        res = sorted(self.conferences)
+        res = sorted(self.conferences, cmp=Conference._cmpByDate)
         if sortType==2:
             res.sort(Conference._cmpTitle)
@@ -2068 +2068 @@
         return "<Conference %s@%s>" % (self.getId(), hex(id(self)))
 
-    def __cmp__(self, toCmp):
+    @staticmethod
+    def _cmpByDate(self, toCmp):
         if not isinstance(toCmp, Conference):
             return cmp(hash(self), hash(toCmp))
@@ -2075 +2076 @@
             return res
         else:
-            return cmp(self.getId(), toCmp.getId())
+            return cmp(self, toCmp)
+
+    def __cmp__(self, toCmp):
+        if not isinstance(toCmp, Conference):
+            return cmp(hash(self), hash(toCmp))
+        return cmp(self.getId(), toCmp.getId())
 
     def __eq__(self, toCmp):