From e06ca271ce89e81f10f2ec952b362ee6413137e6 Mon Sep 17 00:00:00 2001
From: Colas Geier <colas.geier@cen-isere.org>
Date: Fri, 15 Oct 2021 11:28:36 +0200
Subject: [PATCH] update drop fonction

---
 pycen/zh.py | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/pycen/zh.py b/pycen/zh.py
index 49839e7..16ac578 100644
--- a/pycen/zh.py
+++ b/pycen/zh.py
@@ -281,7 +281,7 @@ class zh():
         id_df='id', id_relation='id_sitedelim', id_rela_auth='id_auteur' )
 
       df  = pd.merge(df,dic, how='left', left_on='id_crit_delim', right_on='id', suffixes=(None,'_y')) \
-        .drop(['id_y','id_crit_delim'],1) \
+        .drop(columns=['id_y','id_crit_delim']) \
         .rename(columns={'description_y':'desc_param', 'nom_court':'nom_court_crit','nom':'nom_crit'}) \
         .sort_values('id_site')
 
@@ -308,7 +308,7 @@ class zh():
         id_df='id', id_relation='id_sitefct', id_rela_auth='id_auteur' )
 
       df  = pd.merge(df,dic, how='left', left_on='id_fct', right_on='id', suffixes=(None,'_y')) \
-        .drop(['id_y','id_fct'],1) \
+        .drop(columns=['id_y','id_fct']) \
         .rename(columns={'description_y':'desc_param', 'nom_court':'nom_court_fct','nom':'nom_fct'}) \
         .sort_values('id_site')
 
@@ -328,7 +328,7 @@ class zh():
       df = _get_relation_autor(df, relation_tab='r_rsiteconnect_auteur', schema=self.schema, 
         id_df='id', id_relation='id_siteconnect', id_rela_auth='id_auteur' )
       df  = pd.merge(df,dic, how='left', left_on='id_param_connect', right_on='id', suffixes=(None,'_y')) \
-        .drop(['id_y','id_param_connect'],1) \
+        .drop(columns=['id_y','id_param_connect']) \
         .rename(columns={'description_y':'desc_param', 'nom':'connexion'}) \
         .sort_values('id_site')
 
@@ -349,11 +349,11 @@ class zh():
         id_df='id', id_relation='id_sitesub', id_rela_auth='id_auteur' )
 
       df  = pd.merge(df,d1, how='left', left_on='id_etendsub', right_on='id', suffixes=(None,'_y')) \
-        .drop(['id_y','id_etendsub', 'type'],1) \
+        .drop(columns=['id_y','id_etendsub', 'type']) \
         .rename(columns={'description':'desc_param_etend', 'nom':'Submersion étendue'})
 
       df  = pd.merge(df,d2, how='left', left_on='id_freqsub', right_on='id', suffixes=(None,'_y')) \
-        .drop(['id_y','id_freqsub', 'type'],1) \
+        .drop(columns=['id_y','id_freqsub', 'type']) \
         .rename(columns={'description':'desc_param_freq', 'nom':'Submersion fréquente'}) \
         .sort_values('id_site')
 
@@ -379,14 +379,14 @@ class zh():
         id_df='id', id_relation='id_siteusage', id_rela_auth='id_auteur' )
 
       df = pd.merge(df,dic1, how='left', left_on='id_activ_hum', right_on='id', suffixes=(None,'_y')) \
-        .drop(['id_y','id_activ_hum'],1) \
+        .drop(columns=['id_y','id_activ_hum']) \
         .rename(columns={'description':'desc_param_usag', 'nom':'activite_hum'})
       df = pd.merge(df,dic2, how='left', left_on='id_position', right_on='id', suffixes=(None,'_y')) \
-        .drop(['id_y','id_position'],1) \
+        .drop(columns=['id_y','id_position']) \
         .rename(columns={'description':'desc_param_pos', 'nom':'position'}) \
         .sort_values('id_site')
       df = pd.merge(df,dic3, how='left', left_on='id_impact', right_on='id', suffixes=(None,'_y')) \
-        .drop(['id_y','id_impact'],1) \
+        .drop(columns=['id_y','id_impact']) \
         .rename(columns={'description':'desc_param_imp', 'nom':'impact'}) \
         .sort_values('id_site')
 
@@ -399,7 +399,7 @@ class zh():
     dic1 = self._get_param(param_table='liste_table_topohydro')
     if not df.empty:
       df = pd.merge(df,dic1, how='left', left_on='id_orig', right_on='id', suffixes=(None,'_y')) \
-        .drop(['id_y','id_orig'],1)
+        .drop(columns=['id_y','id_orig'])
       n_tab = df.nom_table.unique()
       for tab in n_tab:
         iids = df.loc[df.nom_table == tab, 'id_topo'].to_list()
@@ -428,7 +428,7 @@ class zh():
       # dic3 = self._get_r_toponymie(ids=df.rmq_toponymie.unique().tolist())
       df.in_out = df.in_out.replace([True,False],['entree','sortie'])
       df = pd.merge(df,dic1, how='left', left_on='id_reg_hydro', right_on='id', suffixes=(None,'_y')) \
-        .drop(['id_y','id_reg_hydro'],1) \
+        .drop(columns=['id_y','id_reg_hydro']) \
         .rename(columns={'description':'desc_param_regHydri', 'nom':'regime_hydri'})
 
       if df.id_permanence.isna().all() :
@@ -436,11 +436,11 @@ class zh():
         df['desc_param_perm'] = None
       else:
         df = pd.merge(df,dic2, how='left', left_on='id_permanence', right_on='id', suffixes=(None,'_y')) \
-          .drop(['id_y','id_permanence'],1) \
+          .drop(columns=['id_y','id_permanence']) \
           .rename(columns={'description':'desc_param_perm', 'nom':'permanence'})
 
       # df = pd.merge(df,dic3, left_on='rmq_toponymie', right_on='id', suffixes=(None,'_y')) \
-      #   .drop(['id_y','rmq_toponymie'],1) \
+      #   .drop(columns=['id_y','rmq_toponymie']) \
       #   .rename(columns={'description':'desc_topo'}) \
       #   .sort_values('id_site')
 
@@ -460,7 +460,7 @@ class zh():
       ids = df[~df.id_cb.isna()].id_cb.unique().tolist()
       dic = ref_hab().get_CB(ids=ids,cols=['id','lb_hab_fr'])
       df = pd.merge(df,dic, how='left', left_on='id_cb', right_on='id', suffixes=(None,'_y')) \
-        .drop(['id_y'], 1) \
+        .drop(columns=['id_y']) \
         .rename(columns={'id_cb':'code_cb'}) \
         .sort_values('id_site')