Karim Sabri / ctools

Commit f52a79f5e07cfd9f0192085bb4f5a0ec5f057f22

Authored by Jürgen Knödlseder
1 parent acaafe2d

Fix once more the sorting of list of dict in comgendb to be compliant with Python 2.3

Inline Side-by-side
Showing 1 changed file with 9 additions and 26 deletions
modules/comscripts/comgendb.py
  View file @f52a79f
... ... @@ -160,23 +160,6 @@ class comgendb(ctools.cscript):
160 160 # Return relative path
161 161 return relpath
162 162  
163   - def _tjd_start(self, element):
164   - """
165   - Return 'tjd_start' value from dictionary
166   -
167   - Parameters
168   - ----------
169   - element : dict
170   - Element of list
171   -
172   - Returns
173   - -------
174   - tjd_start : float
175   - Value of element['tjd_start']
176   - """
177   - # Return
178   - return element.get('tjd_start')
179   -
180 163 def _get_evp_list(self):
181 164 """
182 165 Get EVP list
... ... @@ -209,7 +192,7 @@ class comgendb(ctools.cscript):
209 192 evp_list.extend(evps)
210 193  
211 194 # Sort EVP list by start day
212   - evp_list.sort(key=self._tjd_start)
  195 + evp_list.sort(lambda x,y : cmp(x['tjd_start'], y['tjd_start']))
213 196  
214 197 # Return EVP list
215 198 return evp_list
... ... @@ -291,7 +274,7 @@ class comgendb(ctools.cscript):
291 274 evp_list.append(evp_dict)
292 275  
293 276 # Sort EVP list by start day
294   - evp_list.sort(key=self._tjd_start)
  277 + evp_list.sort(lambda x,y : cmp(x['tjd_start'], y['tjd_start']))
295 278  
296 279 # Return EVP list
297 280 return evp_list
... ... @@ -443,7 +426,7 @@ class comgendb(ctools.cscript):
443 426 oad_list.extend(oads)
444 427  
445 428 # Sort OAD list by start day
446   - oad_list.sort(key=self._tjd_start)
  429 + oad_list.sort(lambda x,y : cmp(x['tjd_start'], y['tjd_start']))
447 430  
448 431 # Return OAD list
449 432 return oad_list
... ... @@ -505,7 +488,7 @@ class comgendb(ctools.cscript):
505 488 oad_list.append(oad_dict)
506 489  
507 490 # Sort OAD list by start day
508   - oad_list.sort(key=self._tjd_start)
  491 + oad_list.sort(lambda x,y : cmp(x['tjd_start'], y['tjd_start']))
509 492  
510 493 # Return OAD list
511 494 return oad_list
... ... @@ -630,7 +613,7 @@ class comgendb(ctools.cscript):
630 613 tim_list.extend(tims)
631 614  
632 615 # Sort TIM list by start day
633   - tim_list.sort(key=self._tjd_start)
  616 + tim_list.sort(lambda x,y : cmp(x['tjd_start'], y['tjd_start']))
634 617  
635 618 # Return TIM list
636 619 return tim_list
... ... @@ -691,8 +674,8 @@ class comgendb(ctools.cscript):
691 674 # Append dictionary
692 675 tim_list.append(tim_dict)
693 676  
694   - # Sort OAD list by start day
695   - tim_list.sort(key=self._tjd_start)
  677 + # Sort TIM list by start day
  678 + tim_list.sort(lambda x,y : cmp(x['tjd_start'], y['tjd_start']))
696 679  
697 680 # Return TIM list
698 681 return tim_list
... ... @@ -841,7 +824,7 @@ class comgendb(ctools.cscript):
841 824 xml_list.append(xml)
842 825  
843 826 # Sort XML list by start day
844   - xml_list.sort(key=self._tjd_start)
  827 + xml_list.sort(lambda x,y : cmp(x['tjd_start'], y['tjd_start']))
845 828  
846 829 # Return XML list
847 830 return xml_list
... ... @@ -1228,7 +1211,7 @@ class comgendb(ctools.cscript):
1228 1211 oads.append(oad)
1229 1212  
1230 1213 # Sort OAD list by start day
1231   - oads.sort(key=self._tjd_start)
  1214 + oads.sort(lambda x,y : cmp(x['tjd_start'], y['tjd_start']))
1232 1215  
1233 1216 # Return OADs
1234 1217 return oads
... ...