Additional corrections to improve flake8 report

Author: lucduron

crue10/etude.py

@@ -226,7 +226,7 @@ def write_etu(self, folder=None):
             etu_path = os.path.join(folder, os.path.basename(self.etu_path))
         xml = 'etu'
         template_render = JINJA_ENV.get_template(xml + '.xml').render(
-            folders=[(name, folder) for name, folder in self.folders.items()],
+            folders=[(name, folder_str) for name, folder_str in self.folders.items()],
             metadata=self.metadata,
             current_scenario_id=self.nom_scenario_courant,
             files=[(os.path.basename(file), file[-8:-4].upper()) for file in sorted(self.filename_list)],

crue10/modele.py

@@ -252,7 +252,7 @@ def write_all(self, folder, folder_config):
     def write_topological_graph(self, out_files, nodesep=0.8, prog='dot'):
         try:
             import pydot
-        except ModuleNotFoundError:
+        except ImportError:  # ModuleNotFoundError not available in Python2
             raise CrueError("Le module pydot ne fonctionne pas !")
 
         check_isinstance(out_files, list)

crue10/sous_modele.py

@@ -2,16 +2,19 @@
 from builtins import super  # Python2 fix
 from collections import OrderedDict
 import fiona
+import numpy as np
 import os.path
 from shapely.geometry import LinearRing, LineString, mapping, Point
 
 from crue10.base import FichierXML
-from crue10.emh.branche import *
+from crue10.emh.branche import BRANCHE_CLASSES, Branche, BranchePdC, BrancheSeuilTransversal, \
+    BrancheSeuilLateral, BrancheOrifice, BrancheStrickler, BrancheNiveauxAssocies, \
+    BrancheBarrageGenerique, BrancheBarrageFilEau, BrancheSaintVenant
 from crue10.emh.casier import Casier, ProfilCasier
 from crue10.emh.noeud import Noeud
-from crue10.emh.section import DEFAULT_FK_MAX, DEFAULT_FK_MIN, DEFAULT_FK_STO, LoiFrottement, LimiteGeom, LitNumerote, \
-    SectionIdem, SectionInterpolee, SectionProfil, SectionSansGeometrie
-from crue10.utils import check_preffix, CrueError, CrueErrorGeometryNotFound, PREFIX
+from crue10.emh.section import DEFAULT_FK_MAX, DEFAULT_FK_MIN, DEFAULT_FK_STO, LoiFrottement, \
+    LimiteGeom, LitNumerote, Section, SectionIdem, SectionInterpolee, SectionProfil, SectionSansGeometrie
+from crue10.utils import check_isinstance, check_preffix, CrueError, CrueErrorGeometryNotFound, logger, PREFIX
 
 
 def parse_loi(elt, group='EvolutionFF', line='PointFF'):
@@ -650,12 +653,12 @@ def write_all(self, folder, folder_config=None):
 
         # TO CHECK:
         # - Casier has at least one ProfilCasier
-        # - BrancheSaintVenant has a section_pilote
+        # - BrancheBarrage* has a section_pilote
         # ...
 
         # Create folder if not existing
+        sm_folder = os.path.join(folder, folder_config, self.id.upper())
         if folder_config is not None:
-            sm_folder = os.path.join(folder, folder_config, self.id.upper())
             if not os.path.exists(sm_folder):
                 os.makedirs(sm_folder)
 

mascaret/mascaret_file.py

@@ -816,7 +816,7 @@ def _read_binary_header(self):
             for i, varname in enumerate(self.varnames):
                 var_index = abbrs.index(varname)
                 self.add_variable(names[var_index], units[var_index], varname)
-        except FileNotFoundError:
+        except IOError:  # FileNotFoundError is not Python2
             self.logger.warning('Mascaret dico file is missing !')
             for i, varname in enumerate(self.varnames):
                 self.add_variable('Rub_long_name_unknown_' + str(i), 'Rub_unit_unknown_' + str(i), varname)

snippets/lire_modele_et_run.py

@@ -69,8 +69,9 @@
     # Write a shp file to check
     schema = {
         'geometry': 'Point',
-        'properties': {'id_section': 'str', **{var: 'float' for var in VARIABLES}}
+        'properties': {'id_section': 'str'}
     }
+    schema['properties'].update({var: 'float' for var in VARIABLES})
     if ADD_BOTTOM:
         schema['properties']['Zf'] = 'float'
     with fiona.open(os.path.join(out_folder, 'debug.shp'), 'w', 'ESRI Shapefile', schema) as out_shp:
@@ -81,11 +82,9 @@
                     values[var] = array[section_index, var_index]
                 layer = {
                     'geometry': mapping(Point(x, y)),
-                    'properties': {
-                        'id_section': section_name,
-                        **values
-                    }
+                    'properties': {'id_section': section_name}
                 }
+                layer['properties'].update(values)
                 if ADD_BOTTOM:
                     layer['properties']['Zf'] = z_bottom
                 out_shp.write(layer)

snippets/lire_sous_modele.py

@@ -42,7 +42,7 @@
             point = section.interp_point(section.lits_numerotes[i_lit - 1].xt_max)
         print((point.x, point.y))
 
-except FileNotFoundError as e:
+except IOError as e:
     logger.critical(e)
     sys.exit(1)
 except CrueError as e:

snippets/post_crue_VS.py

@@ -31,8 +31,9 @@
     variables = ['Zseuil_min', 'Qmax', 'Qmin']
     schema = {
         'geometry': 'LineString',
-        'properties': {'id_branche': 'str', **{var: 'str' for var in variables}}
+        'properties': {'id_branche': 'str'}
     }
+    schema['properties'].update({var: 'float' for var in variables})
     with fiona.open(os.path.join(model_folder, 'check_at_branches.shp'), 'w', 'ESRI Shapefile', schema) as out_shp:
         for sous_modele in modele.liste_sous_modeles:
             sous_modele.convert_sectionidem_to_sectionprofil()
@@ -52,11 +53,9 @@
 
                     layer = {
                         'geometry': mapping(branche.geom),
-                        'properties': {
-                            'id_branche': branche.id,
-                            **values
-                        }
+                        'properties': {'id_branche': branche.id}
                     }
+                    layer['properties'].update(values)
                     out_shp.write(layer)
 
 except CrueError as e:

snippets/write_submodel_from_scratch.py

@@ -4,10 +4,12 @@
 import os.path
 from shapely.geometry import Point, LinearRing, LineString
 
-from crue10.emh.branche import *
+from crue10.emh.branche import BranchePdC, BrancheSeuilTransversal, \
+    BrancheSeuilLateral, BrancheOrifice, BrancheStrickler, BrancheNiveauxAssocies, \
+    BrancheBarrageGenerique, BrancheBarrageFilEau, BrancheSaintVenant
 from crue10.emh.casier import Casier, ProfilCasier
 from crue10.emh.noeud import Noeud
-from crue10.emh.section import *
+from crue10.emh.section import LimiteGeom, SectionIdem, SectionProfil, SectionSansGeometrie
 from crue10.sous_modele import SousModele
 from crue10.utils import logger