From cadc10bb99414157264eebacc5c25c3ec5526054 Mon Sep 17 00:00:00 2001 From: Jürgen Knödlseder Date: Mon, 21 Mar 2016 14:07:27 +0100 Subject: [PATCH] Rename file to file_ in csmodelmerge.py. --- cscripts/csmodelmerge.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cscripts/csmodelmerge.py b/cscripts/csmodelmerge.py index 8027708..cf18fbd 100755 --- a/cscripts/csmodelmerge.py +++ b/cscripts/csmodelmerge.py @@ -121,10 +121,10 @@ class csmodelmerge(ctools.cscript): self._models = gammalib.GModels() # Loop over model files - for file in self._files: + for file_ in self._files: # Construct container from XML file - models = gammalib.GModels(file) + models = gammalib.GModels(file_) # Log number of models to add if self._logTerse(): @@ -136,7 +136,7 @@ class csmodelmerge(ctools.cscript): else: self._log(gammalib.parformat("Add %d models from file" % nmodels)) - self._log(file) + self._log(file_) self._log("\n") # Extend model container by adding all models in the model file -- libgit2 0.21.4