Merge pull request #350 from ajparsons/windows-newline

Resolves issue where CSVs saved in Windows have blank lines
OpenDataServices · Jun 12, 2020 · 5a9a25f · 5a9a25f
2 parents ba3d46a + 9242551
commit 5a9a25f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 - All code has had black and isort applied. These have been added to Travis.
 
+## Fixed
+
+- Remove extra lines in CSVs under Windows https://github.com/OpenDataServices/flatten-tool/pull/350
+
 ## [0.11.0] - 2020-02-21
 
 ### Added

diff --git a/flattentool/input.py b/flattentool/input.py
@@ -182,10 +182,7 @@ def merge(base, mergee, debug_info=None):
                             + id_info
                         )
                     warnings_for_ignored_columns(
-                        v,
-                        "because another column treats it as an array or object".format(
-                            key
-                        ),
+                        v, "because another column treats it as an array or object"
                     )
                     continue
                 base_value = base[key].cell_value

diff --git a/flattentool/output.py b/flattentool/output.py
@@ -90,6 +90,7 @@ def write_sheet(self, sheet_name, sheet):
         with open(
             os.path.join(self.output_name, self.sheet_prefix + sheet_name + ".csv"),
             "w",
+            newline="",
             encoding="utf-8",
         ) as csv_file:
             dictwriter = csv.DictWriter(csv_file, sheet_header)