🐛 no empty extra line at end of generated files

MiWeiss · tdsimao · web-flow · commit f84e3189b2bc · 2022-06-03T14:11:56.000+02:00
* use str join to avoid inserting extra entry separator

* remove extra line from tests

Co-authored-by: tdsimao &lt;tdsimao@users.noreply.github.com&gt;
diff --git a/bibtexparser/bwriter.py b/bibtexparser/bwriter.py
@@ -97,7 +97,6 @@ def write(self, bib_database):
         return bibtex
 
     def _entries_to_bibtex(self, bib_database):
-        bibtex = ''
         if self.order_entries_by:
             # TODO: allow sort field does not exist for entry
             entries = sorted(bib_database.entries, key=lambda x: BibDatabase.entry_sort_key(x, self.order_entries_by))
@@ -109,9 +108,7 @@ def _entries_to_bibtex(self, bib_database):
             widths = [max(map(len, entry.keys())) for entry in entries]
             self._max_field_width = max(widths)
 
-        for entry in entries:
-            bibtex += self._entry_to_bibtex(entry)
-        return bibtex
+        return self.entry_separator.join(self._entry_to_bibtex(entry) for entry in entries)
 
     def _entry_to_bibtex(self, entry):
         bibtex = ''
@@ -143,7 +140,7 @@ def _entry_to_bibtex(self, entry):
                 bibtex += '\n'+self.indent+','
             else:
                 bibtex += ','
-        bibtex += "\n}\n" + self.entry_separator
+        bibtex += "\n}\n"
         return bibtex
 
     def _comments_to_bibtex(self, bib_database):
diff --git a/bibtexparser/tests/data/article_comma_first.bib b/bibtexparser/tests/data/article_comma_first.bib
@@ -16,3 +16,4 @@ @ARTICLE{ Baltazar2013
         , journal = {Nice Journal}
         , comments = {A comment}
         , keyword = {keyword1, keyword2}}
+
diff --git a/bibtexparser/tests/data/article_comma_first_and_trailing_comma_output.bib b/bibtexparser/tests/data/article_comma_first_and_trailing_comma_output.bib
@@ -12,4 +12,3 @@ @article{Cesar2013
  , year = {2013}
  ,
 }
-
diff --git a/bibtexparser/tests/data/article_output.bib b/bibtexparser/tests/data/article_output.bib
@@ -11,4 +11,3 @@ @article{Cesar2013
  volume = {12},
  year = {2013}
 }
-
diff --git a/bibtexparser/tests/data/article_trailing_comma_output.bib b/bibtexparser/tests/data/article_trailing_comma_output.bib
@@ -11,4 +11,3 @@ @article{Cesar2013
  volume = {12},
  year = {2013},
 }
-
diff --git a/bibtexparser/tests/data/article_with_annotation_output.bib b/bibtexparser/tests/data/article_with_annotation_output.bib
@@ -12,4 +12,3 @@ @article{Cesar2013
  volume = {12},
  year = {2013}
 }
-
diff --git a/bibtexparser/tests/data/article_with_strings_output.bib b/bibtexparser/tests/data/article_with_strings_output.bib
@@ -15,4 +15,3 @@ @article{Cesar2013
  volume = {12},
  year = {2013}
 }
-
diff --git a/bibtexparser/tests/data/book_comma_first.bib b/bibtexparser/tests/data/book_comma_first.bib
@@ -6,4 +6,3 @@ @book{Bird1987
    , volume = {1}
    , year = {1987}
 }
-
diff --git a/bibtexparser/tests/data/book_output.bib b/bibtexparser/tests/data/book_output.bib
@@ -6,4 +6,3 @@ @book{Bird1987
  volume = {1},
  year = {1987}
 }
-
diff --git a/bibtexparser/tests/data/multiple_entries_and_comments_output.bib b/bibtexparser/tests/data/multiple_entries_and_comments_output.bib
@@ -26,4 +26,3 @@ @book{Yablon2005
  title = {Optical fiber fusion slicing},
  year = {2005}
 }
-
diff --git a/bibtexparser/tests/data/multiple_entries_output.bib b/bibtexparser/tests/data/multiple_entries_output.bib
@@ -22,4 +22,3 @@ @book{Yablon2005
  title = {Optical fiber fusion slicing},
  year = {2005}
 }
-
diff --git a/bibtexparser/tests/test_bibtexparser.py b/bibtexparser/tests/test_bibtexparser.py
@@ -73,7 +73,6 @@ class TestBibtexparserWriteMethods(unittest.TestCase):
  volume = {1},
  year = {1987}
 }
-
 """
 
     def test_write_str(self):
diff --git a/bibtexparser/tests/test_bibtexwriter.py b/bibtexparser/tests/test_bibtexwriter.py
@@ -38,7 +38,6 @@ def test_content_entries_only(self):
  title = {Optical fiber fusion slicing},
  year = {2005}
 }
-
 """
         self.assertEqual(result, expected)
 
@@ -68,7 +67,6 @@ def test_indent(self):
 """@book{abc123,
   author = {test}
 }
-
 """
         self.assertEqual(result, expected)
 
@@ -86,7 +84,6 @@ def test_align(self):
  author             = {test},
  thisisaverylongkey = {longvalue}
 }
-
 """
         self.assertEqual(result, expected)
 
@@ -121,7 +118,6 @@ def test_align(self):
  title     = {Optical fiber fusion slicing},
  year      = {2005}
 }
-
 """
         self.assertEqual(result, expected)
 
@@ -173,7 +169,6 @@ def test_display_order(self):
  title = {Optical fiber fusion slicing},
  author = {Yablon, A.D.}
 }
-
 """
         self.assertEqual(result, expected)
 
@@ -189,35 +184,35 @@ class TestEntrySorting(unittest.TestCase):
 
     def test_sort_default(self):
         result = bibtexparser.dumps(self.bib_database)
-        expected = "@book{a\n}\n\n@article{b\n}\n\n@book{c\n}\n\n"
+        expected = "@book{a\n}\n\n@article{b\n}\n\n@book{c\n}\n"
         self.assertEqual(result, expected)
 
     def test_sort_none(self):
         writer = BibTexWriter()
         writer.order_entries_by = None
         result = bibtexparser.dumps(self.bib_database, writer)
-        expected = "@article{b\n}\n\n@book{c\n}\n\n@book{a\n}\n\n"
+        expected = "@article{b\n}\n\n@book{c\n}\n\n@book{a\n}\n"
         self.assertEqual(result, expected)
 
     def test_sort_id(self):
         writer = BibTexWriter()
         writer.order_entries_by = ('ID', )
         result = bibtexparser.dumps(self.bib_database, writer)
-        expected = "@book{a\n}\n\n@article{b\n}\n\n@book{c\n}\n\n"
+        expected = "@book{a\n}\n\n@article{b\n}\n\n@book{c\n}\n"
         self.assertEqual(result, expected)
 
     def test_sort_type(self):
         writer = BibTexWriter()
         writer.order_entries_by = ('ENTRYTYPE', )
         result = bibtexparser.dumps(self.bib_database, writer)
-        expected = "@article{b\n}\n\n@book{c\n}\n\n@book{a\n}\n\n"
+        expected = "@article{b\n}\n\n@book{c\n}\n\n@book{a\n}\n"
         self.assertEqual(result, expected)
 
     def test_sort_type_id(self):
         writer = BibTexWriter()
         writer.order_entries_by = ('ENTRYTYPE', 'ID')
         result = bibtexparser.dumps(self.bib_database, writer)
-        expected = "@article{b\n}\n\n@book{a\n}\n\n@book{c\n}\n\n"
+        expected = "@article{b\n}\n\n@book{a\n}\n\n@book{c\n}\n"
         self.assertEqual(result, expected)
 
     def test_sort_missing_field(self):
@@ -233,7 +228,7 @@ def test_sort_missing_field(self):
         writer = BibTexWriter()
         writer.order_entries_by = ('year', )
         result = bibtexparser.dumps(bib_database, writer)
-        expected = "@book{a\n}\n\n@article{b,\n year = {2000}\n}\n\n@book{c,\n year = {2010}\n}\n\n"
+        expected = "@book{a\n}\n\n@article{b,\n year = {2000}\n}\n\n@book{c,\n year = {2010}\n}\n"
         self.assertEqual(result, expected)
 
     def test_unicode_problems(self):

Original file line number	Diff line number	Diff line change
`@@ -12,4 +12,3 @@ @article{Cesar2013`
`12`	`12`	`, year = {2013}`
`13`	`13`	`,`
`14`	`14`	`}`
`15`		`-`
Original file line number	Diff line number	Diff line change
`@@ -11,4 +11,3 @@ @article{Cesar2013`
`11`	`11`	`volume = {12},`
`12`	`12`	`year = {2013}`
`13`	`13`	`}`
`14`		`-`
Original file line number	Diff line number	Diff line change
`@@ -15,4 +15,3 @@ @article{Cesar2013`
`15`	`15`	`volume = {12},`
`16`	`16`	`year = {2013}`
`17`	`17`	`}`
`18`		`-`
Original file line number	Diff line number	Diff line change
`@@ -6,4 +6,3 @@ @book{Bird1987`
`6`	`6`	`, volume = {1}`
`7`	`7`	`, year = {1987}`
`8`	`8`	`}`
`9`		`-`
Original file line number	Diff line number	Diff line change
`@@ -6,4 +6,3 @@ @book{Bird1987`
`6`	`6`	`volume = {1},`
`7`	`7`	`year = {1987}`
`8`	`8`	`}`
`9`		`-`
Original file line number	Diff line number	Diff line change
`@@ -26,4 +26,3 @@ @book{Yablon2005`
`26`	`26`	`title = {Optical fiber fusion slicing},`
`27`	`27`	`year = {2005}`
`28`	`28`	`}`
`29`		`-`