Skip to content

Add new line to end of file when rendering #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Add new line to end of file when rendering #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c831515
Fix for edge list, adj list
PatrickOHara Oct 11, 2021
5e2579f
End of file fix
PatrickOHara Oct 11, 2021
66c6c05
Restore changes to edge list fix
PatrickOHara Oct 12, 2021
c38a698
Append new line to end of file render
PatrickOHara Oct 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions tests/models/test_problem.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ class TestProblem(M.Problem):
@pytest.mark.parametrize('text,value,exc', [
('FOO: 42\nBAR: answer', {'foo': 42, 'bar': 'answer'}, None),
('FOO: 4.2\nBAR: answer', None, E.ParsingError),
('FOO: 42\nBAR: answer\nEOF\n', {'foo': 42, 'bar': 'answer'}, None)
])
def test_model_parse(TestProblem, text, value, exc):
if exc:
Expand All @@ -29,8 +30,8 @@ def test_model_parse(TestProblem, text, value, exc):


@pytest.mark.parametrize('value,text,exc', [
({'foo': 42, 'bar': 'answer'}, 'FOO: 42\nBAR: answer\nEOF', None),
({'foo': 42, 'bar': 'answer', 'baz': 'wat'}, 'FOO: 42\nBAR: answer\nEOF', None), # noqa: E501
({'foo': 42, 'bar': 'answer'}, 'FOO: 42\nBAR: answer\nEOF\n', None),
({'foo': 42, 'bar': 'answer', 'baz': 'wat'}, 'FOO: 42\nBAR: answer\nEOF\n', None), # noqa: E501
])
def test_model_render(TestProblem, value, text, exc):
problem = TestProblem(**value)
Expand Down
4 changes: 2 additions & 2 deletions tsplib95/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ def parse(cls, text, **options):
# parse into a dictionary
data = {}
for keyword, value in zip(field_keywords, field_values):
if keyword != 'EOF':
if keyword and keyword != 'EOF':
field = cls.fields_by_keyword[keyword]
name = cls.names_by_keyword[keyword]
data[name] = field.parse(value.strip())
Expand Down Expand Up @@ -228,7 +228,7 @@ def render(self):
for keyword, value in rendered.items():
sep = ':\n' if '\n' in value else ': '
kvpairs.append(f'{keyword}{sep}{value}')
kvpairs.append('EOF')
kvpairs.append('EOF\n')

# join and return the result
return '\n'.join(kvpairs)
Expand Down