Commit a660dbce75deb35cb20d7309e343a1bc601a6aee
Merge branch '1497-fix-tsmerge-when-reading-ascii-file' into integration
Showing
1 changed file
with
1 additions
and
1 deletions
scripts/tsmerge.py
| @@ -155,7 +155,7 @@ if __name__ == "__main__": | @@ -155,7 +155,7 @@ if __name__ == "__main__": | ||
| 155 | files = kwargs["files"] | 155 | files = kwargs["files"] |
| 156 | allfiles = [] | 156 | allfiles = [] |
| 157 | if os.path.isfile(files): | 157 | if os.path.isfile(files): |
| 158 | - allfiles = open(files).readlines() | 158 | + allfiles = open(files).read().splitlines() |
| 159 | else: | 159 | else: |
| 160 | allfiles = glob.glob(files) | 160 | allfiles = glob.glob(files) |
| 161 | 161 |