Skip to content

Resolves unicode issues with image listing #567

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
sudorandom merged 1 commit into from
Jun 30, 2015
Merged

Resolves unicode issues with image listing #567

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
2 changes: 1 addition & 1 deletion SoftLayer/CLI/formatting.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def format_output(data, fmt='table'): # pylint: disable=R0911,R0912
# responds to .formatted
if hasattr(data, 'formatted'):
if fmt == 'table':
return str(data.formatted)
return data.formatted

# responds to .separator
if hasattr(data, 'separator'):
Expand Down
12 changes: 12 additions & 0 deletions SoftLayer/tests/CLI/helper_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# -*- coding: utf-8 -*-
"""
SoftLayer.tests.CLI.helper_tests
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Expand Down Expand Up @@ -357,6 +358,17 @@ def test_format_output_python_keyvaluetable(self):
ret = formatting.format_output(t, 'python')
self.assertEqual({'nothing': None}, ret)

def test_format_output_unicode(self):
t = formatting.format_output('☃', 'raw')
self.assertEqual('☃', t)

item = formatting.FormattedItem('raw ☃', '☃')
t = formatting.format_output(item)
self.assertEqual('☃', t)

t = formatting.format_output(item, 'raw')
self.assertEqual('raw ☃', t)


class TestTemplateArgs(testing.TestCase):

Expand Down