Karim Sabri / ctools

Commit acaafe2d57391b13683129c36c26051575d6695f

Authored by Jürgen Knödlseder
1 parent 9201436b

Replaced sorted() by sort() function in comgendb for Python 2.3 compatibility

Inline Side-by-side
Showing 1 changed file with 25 additions and 8 deletions
modules/comscripts/comgendb.py
  View file @acaafe2
... ... @@ -160,6 +160,23 @@ 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 +
163 180 def _get_evp_list(self):
164 181 """
165 182 Get EVP list
... ... @@ -192,7 +209,7 @@ class comgendb(ctools.cscript):
192 209 evp_list.extend(evps)
193 210  
194 211 # Sort EVP list by start day
195   - evp_list = sorted(evp_list, key=lambda k: k['tjd_start'])
  212 + evp_list.sort(key=self._tjd_start)
196 213  
197 214 # Return EVP list
198 215 return evp_list
... ... @@ -274,7 +291,7 @@ class comgendb(ctools.cscript):
274 291 evp_list.append(evp_dict)
275 292  
276 293 # Sort EVP list by start day
277   - evp_list = sorted(evp_list, key=lambda k: k['tjd_start'])
  294 + evp_list.sort(key=self._tjd_start)
278 295  
279 296 # Return EVP list
280 297 return evp_list
... ... @@ -426,7 +443,7 @@ class comgendb(ctools.cscript):
426 443 oad_list.extend(oads)
427 444  
428 445 # Sort OAD list by start day
429   - oad_list = sorted(oad_list, key=lambda k: k['tjd_start'])
  446 + oad_list.sort(key=self._tjd_start)
430 447  
431 448 # Return OAD list
432 449 return oad_list
... ... @@ -488,7 +505,7 @@ class comgendb(ctools.cscript):
488 505 oad_list.append(oad_dict)
489 506  
490 507 # Sort OAD list by start day
491   - oad_list = sorted(oad_list, key=lambda k: k['tjd_start'])
  508 + oad_list.sort(key=self._tjd_start)
492 509  
493 510 # Return OAD list
494 511 return oad_list
... ... @@ -613,7 +630,7 @@ class comgendb(ctools.cscript):
613 630 tim_list.extend(tims)
614 631  
615 632 # Sort TIM list by start day
616   - tim_list = sorted(tim_list, key=lambda k: k['tjd_start'])
  633 + tim_list.sort(key=self._tjd_start)
617 634  
618 635 # Return TIM list
619 636 return tim_list
... ... @@ -675,7 +692,7 @@ class comgendb(ctools.cscript):
675 692 tim_list.append(tim_dict)
676 693  
677 694 # Sort OAD list by start day
678   - tim_list = sorted(tim_list, key=lambda k: k['tjd_start'])
  695 + tim_list.sort(key=self._tjd_start)
679 696  
680 697 # Return TIM list
681 698 return tim_list
... ... @@ -824,7 +841,7 @@ class comgendb(ctools.cscript):
824 841 xml_list.append(xml)
825 842  
826 843 # Sort XML list by start day
827   - xml_list = sorted(xml_list, key=lambda k: k['tjd_start'])
  844 + xml_list.sort(key=self._tjd_start)
828 845  
829 846 # Return XML list
830 847 return xml_list
... ... @@ -1211,7 +1228,7 @@ class comgendb(ctools.cscript):
1211 1228 oads.append(oad)
1212 1229  
1213 1230 # Sort OAD list by start day
1214   - oads = sorted(oads, key=lambda k: k['tjd_start'])
  1231 + oads.sort(key=self._tjd_start)
1215 1232  
1216 1233 # Return OADs
1217 1234 return oads
... ...