Ignore:
Timestamp:
02/12/16 18:08:59 (3 years ago)
Author:
mjuckes
Message:

release candidate

File:
1 edited

Legend:

Unmodified
Added
Removed
  • CMIP6dreqbuild/trunk/src/framework/dreqPy/makeTables.py

    r879 r885  
    288288    return cmp(0,1) 
    289289 
    290  
    291290if not oldpython: 
    292291  kAnnex = cmp_to_key( cmpAnnex ) 
     292  kCmpdn = cmp_to_key( cmpdn(['sn','label']).cmp ) 
     293  kCmpdnPrl = cmp_to_key( cmpdn(['prov','rowIndex','label']).cmp ) 
    293294 
    294295import re 
     
    344345      vl =  list( set( [v.vid for v in cmv] )  ) 
    345346      vli = [dq.inx.uid[i] for i in vl] 
    346       thisvli =  sorted( vli, cmp=cmpdn(['sn','label']).cmp ) 
     347      if oldpython: 
     348        thisvli =  sorted( vli, cmp=cmpdn(['sn','label']).cmp ) 
     349      else: 
     350        thisvli = sorted( vli, key=kCmpdn ) 
    347351      wb.var() 
    348352       
     
    361365 
    362366        j = 0 
    363         thiscmv =  sorted( [dq.inx.uid[u] for u in ixt[t]], cmp=cmpdn(['prov','rowIndex','label']).cmp ) 
     367        if oldpython: 
     368          thiscmv =  sorted( [dq.inx.uid[u] for u in ixt[t]], cmp=cmpdn(['prov','rowIndex','label']).cmp ) 
     369        else: 
     370          thiscmv = sorted( [dq.inx.uid[u] for u in ixt[t]], key=kCmpdnPrl ) 
    364371 
    365372        for v in thiscmv: 
Note: See TracChangeset for help on using the changeset viewer.