Projet

Général

Profil

0002-move-wcs.formdata.flatten_dict-into-qommon.misc.patch

Benjamin Dauvergne, 07 janvier 2017 20:59

Télécharger (1,72 ko)

Voir les différences: 

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


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

  		




  33
  34
  
    
from roles import Role

  		




  ......




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

  		




  91
  92
  
    
    return new_data

  		




  92
  93
  
    

  		




  93
  
  
    
def flatten_dict(d):

  		




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

  		




  95
  
  
    
        if type(v) is dict:

  		




  96
  
  
    
            flatten_dict(v)

  		




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

  		




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

  		




  99
  
  
    
            del d[k]

  		




  100
  
  
    

  		




  101
  94
  
    

  		




  102
  95
  
    
def get_json_dict(fields, data, include_files=True, anonymise=False):

  		




  103
  96
  
    
    new_data = {}

  		












  

    
      wcs/qommon/misc.py
    
  





  533
  533
  
    
        if raises:

  		




  534
  534
  
    
            raise

  		




  535
  535
  
    
        return expr

  		




  
  536
  
    

  		




  
  537
  
    
def flatten_dict(d):

  		




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

  		




  
  539
  
    
        if type(v) is dict:

  		




  
  540
  
    
            flatten_dict(v)

  		




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

  		




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

  		




  
  543
  
    
            del d[k]

  		




  536
  
  
    
-