Skip to content

Add newline for last row for tsv output (fixes #180) #238

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

Merged
johanste merged 1 commit into from
May 12, 2016
Merged

Add newline for last row for tsv output (fixes #180) #238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 4 deletions src/azure/cli/_output.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,16 +242,13 @@ def _dump_row(data, stream):
separator = '\t'
else:
TsvOutput._dump_obj(data, stream)
stream.write('\n')

@staticmethod
def dump(data):
io = StringIO()
first_line = True
for item in data:
if not first_line:
io.write('\n')
TsvOutput._dump_row(item, io)
first_line = False

result = io.getvalue()
io.close()
Expand Down
8 changes: 4 additions & 4 deletions src/azure/cli/tests/test_output.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,22 +160,22 @@ def test_output_format_dict(self):
obj['A'] = 1
obj['B'] = 2
result = format_tsv(obj)
self.assertEqual(result, '1\t2')
self.assertEqual(result, '1\t2\n')

def test_output_format_dict_sort(self):
obj = {}
obj['B'] = 1
obj['A'] = 2
result = format_tsv(obj)
self.assertEqual(result, '2\t1')
self.assertEqual(result, '2\t1\n')

def test_output_format_ordereddict_not_sorted(self):
from collections import OrderedDict
obj = OrderedDict()
obj['B'] = 1
obj['A'] = 2
result = format_tsv(obj)
self.assertEqual(result, '1\t2')
self.assertEqual(result, '1\t2\n')

def test_output_format_ordereddict_list_not_sorted(self):
from collections import OrderedDict
Expand All @@ -187,7 +187,7 @@ def test_output_format_ordereddict_list_not_sorted(self):
obj2['A'] = 3
obj2['B'] = 4
result = format_tsv([obj1, obj2])
self.assertEqual(result, '1\t2\n3\t4')
self.assertEqual(result, '1\t2\n3\t4\n')

if __name__ == '__main__':
unittest.main()