Projet

Général

Profil

0003-move-wcs.formdata.flatten_dict-into-qommon.misc-1451.patch

Benjamin Dauvergne, 16 mars 2017 16:25

Télécharger (1,71 ko)

Voir les différences: 

Subject: [PATCH 3/4] move wcs.formdata.flatten_dict() into qommon.misc
 (#14510)


 wcs/formdata.py    | 9 +--------
 wcs/qommon/misc.py | 8 ++++++++
 2 files changed, 9 insertions(+), 8 deletions(-)
wcs/formdata.py
30 30 
from qommon.storage import StorableObject, Intersects, Contains
31 31 
import qommon.misc
32 32 
from qommon import ezt
33 
from qommon.misc import flatten_dict
33 34 
from qommon.substitution import Substitutions
34 35 

  		




  35
  36
  
    
from roles import Role

  		




  ......




  92
  93
  
    
                            new_data['var_%s_%s_%s' % (field.varname, i, k)] = v

  		




  93
  94
  
    
    return new_data

  		




  94
  95
  
    

  		




  95
  
  
    
def flatten_dict(d):

  		




  96
  
  
    
    for k, v in d.items():

  		




  97
  
  
    
        if type(v) is dict:

  		




  98
  
  
    
            flatten_dict(v)

  		




  99
  
  
    
            for k2, v2 in v.items():

  		




  100
  
  
    
                d['%s_%s' % (k, k2)] = v2

  		




  101
  
  
    
            del d[k]

  		




  102
  
  
    

  		




  103
  96
  
    

  		




  104
  97
  
    
def get_json_dict(fields, data, include_files=True, anonymise=False):

  		




  105
  98
  
    
    new_data = {}

  		












  

    
      wcs/qommon/misc.py
    
  





  550
  550
  
    
        if raises:

  		




  551
  551
  
    
            raise

  		




  552
  552
  
    
        return expr

  		




  
  553
  
    

  		




  
  554
  
    
def flatten_dict(d):

  		




  
  555
  
    
    for k, v in d.items():

  		




  
  556
  
    
        if type(v) is dict:

  		




  
  557
  
    
            flatten_dict(v)

  		




  
  558
  
    
            for k2, v2 in v.items():

  		




  
  559
  
    
                d['%s_%s' % (k, k2)] = v2

  		




  
  560
  
    
            del d[k]

  		




  553
  
  
    
-