Commit cadc10bb99414157264eebacc5c25c3ec5526054
1 parent
bd587f4b
Rename file to file_ in csmodelmerge.py.
Showing
1 changed file
with
3 additions
and
3 deletions
cscripts/csmodelmerge.py
| @@ -121,10 +121,10 @@ class csmodelmerge(ctools.cscript): | @@ -121,10 +121,10 @@ class csmodelmerge(ctools.cscript): | ||
| 121 | self._models = gammalib.GModels() | 121 | self._models = gammalib.GModels() |
| 122 | 122 | ||
| 123 | # Loop over model files | 123 | # Loop over model files |
| 124 | - for file in self._files: | 124 | + for file_ in self._files: |
| 125 | 125 | ||
| 126 | # Construct container from XML file | 126 | # Construct container from XML file |
| 127 | - models = gammalib.GModels(file) | 127 | + models = gammalib.GModels(file_) |
| 128 | 128 | ||
| 129 | # Log number of models to add | 129 | # Log number of models to add |
| 130 | if self._logTerse(): | 130 | if self._logTerse(): |
| @@ -136,7 +136,7 @@ class csmodelmerge(ctools.cscript): | @@ -136,7 +136,7 @@ class csmodelmerge(ctools.cscript): | ||
| 136 | else: | 136 | else: |
| 137 | self._log(gammalib.parformat("Add %d models from file" % | 137 | self._log(gammalib.parformat("Add %d models from file" % |
| 138 | nmodels)) | 138 | nmodels)) |
| 139 | - self._log(file) | 139 | + self._log(file_) |
| 140 | self._log("\n") | 140 | self._log("\n") |
| 141 | 141 | ||
| 142 | # Extend model container by adding all models in the model file | 142 | # Extend model container by adding all models in the model file |