diff --git a/src/Model/Results/ResultsAdisTS.py b/src/Model/Results/ResultsAdisTS.py index ac75c35db9efe5a82306300de6b4f49681be7312..e7bdcc065cea3065c775d1069e02426c3d3536c4 100644 --- a/src/Model/Results/ResultsAdisTS.py +++ b/src/Model/Results/ResultsAdisTS.py @@ -17,7 +17,6 @@ import logging import numpy as np import os -import glob from copy import deepcopy from datetime import datetime @@ -42,10 +41,8 @@ class Results(object): "creation_date": datetime.now(), } repertory_results = os.path.join(repertory, "resultats") - self._pollutants_list = [ - el.split("/")[-1][0:-4] - for el in glob.glob(repertory_results + "/*.bin") - ] + filelist = [f for f in os.listdir(repertory_results) if os.path.isfile(os.path.join(repertory_results, f))] + self._pollutants_list = [f[0:-4] for f in filelist if f[-4:] == ".bin"] self._pollutants_list.insert(0, self._pollutants_list.pop( self._pollutants_list.index("total_sediment")) ) diff --git a/src/Solver/AdisTS.py b/src/Solver/AdisTS.py index 337736dc6339acd91b07d8939d0bf14d38af58e4..4578a23e88772ef5278eb9e012996f92d26febf0 100644 --- a/src/Solver/AdisTS.py +++ b/src/Solver/AdisTS.py @@ -17,7 +17,6 @@ # -*- coding: utf-8 -*- import os -import glob import logging import numpy as np @@ -621,9 +620,8 @@ class AdisTSwc(AdisTS): def read_bin(self, study, repertory, results, qlog=None, name="0"): repertory_results = os.path.join(repertory, "resultats") - - files_bin_names = [el.split("/")[-1] - for el in glob.glob(repertory_results+"/*.bin")] + filelist = [f for f in os.listdir(repertory_results) if os.path.isfile(os.path.join(repertory_results, f))] + files_bin_names = [f for f in filelist if f[-4:] == ".bin"] files_bin_names.insert(0, files_bin_names.pop( files_bin_names.index("total_sediment.bin")) ) @@ -856,11 +854,11 @@ class AdisTSwc(AdisTS): return repertory_results = os.path.join(repertory, "resultats") + filelist = [f for f in os.listdir(repertory_results) if os.path.isfile(os.path.join(repertory_results, f))] + files_bin_names = [f for f in filelist if f[-4:] == ".bin"] - files_bin_names = [el.split("/")[-1] - for el in glob.glob(repertory_results+"/*.bin")] - for el in glob.glob(repertory_results+"/*.bin"): - os.remove(el) + for el in files_bin_names: + os.remove(os.path.join(repertory_results, el)) @timer def export(self, study, repertory, mage_rep, qlog=None, name="0"):