Better handles unicode in slcli for raw output

Closes #739.
softlayer · Jul 8, 2016 · 1a2ddfa · 1a2ddfa
1 parent 10600bf
commit 1a2ddfa
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 9 deletions.
diff --git a/SoftLayer/CLI/formatting.py b/SoftLayer/CLI/formatting.py
@@ -12,6 +12,7 @@
 
 import click
 import prettytable
+import six
 
 from SoftLayer.CLI import exceptions
 from SoftLayer import utils
@@ -323,6 +324,10 @@ def __str__(self):
         # If the original value is None, represent this as 'NULL'
         if self.original is None:
             return 'NULL'
+
+        if isinstance(self.original, six.string_types):
+            return str(self.original.encode('utf8'))
+
         return str(self.original)
 
     __repr__ = __str__

diff --git a/SoftLayer/fixtures/SoftLayer_Account.py b/SoftLayer/fixtures/SoftLayer_Account.py
@@ -1,19 +1,24 @@
+# -*- coding: UTF-8 -*-
+
 getPrivateBlockDeviceTemplateGroups = [{
     'accountId': 1234,
     'blockDevices': [],
     'createDate': '2013-12-05T21:53:03-06:00',
     'globalIdentifier': 'E6DBD73B-1651-4B28-BCBA-A11DF7C9D79E',
     'id': 200,
     'name': 'test_image',
-    'parentId': ''
+    'parentId': '',
+    'publicFlag': False,
 }, {
     'accountId': 1234,
     'blockDevices': [],
     'createDate': '2013-12-05T21:53:03-06:00',
     'globalIdentifier': 'F9329795-4220-4B0A-B970-C86B950667FA',
     'id': 201,
-    'name': 'private_image2',
-    'parentId': ''
+    # 'name': 'private_image2',
+    'name': u'a¬ሴ€耀',
+    'parentId': '',
+    'publicFlag': False,
 }]
 
 getVirtualGuests = [{

diff --git a/SoftLayer/fixtures/SoftLayer_Virtual_Guest_Block_Device_Template_Group.py b/SoftLayer/fixtures/SoftLayer_Virtual_Guest_Block_Device_Template_Group.py
@@ -5,15 +5,17 @@
     'globalIdentifier': '0B5DEAF4-643D-46CA-A695-CECBE8832C9D',
     'id': 100,
     'name': 'test_image',
-    'parentId': ''
+    'parentId': '',
+    'publicFlag': True,
 }, {
     'accountId': 1234,
     'blockDevices': [],
     'createDate': '2013-12-05T21:53:03-06:00',
     'globalIdentifier': 'EB38414C-2AB3-47F3-BBBD-56A5F689620B',
     'id': 101,
     'name': 'test_image2',
-    'parentId': ''
+    'parentId': '',
+    'publicFlag': True,
 }]
 
 getObject = IMAGES[0]

diff --git a/SoftLayer/testing/xmlrpc.py b/SoftLayer/testing/xmlrpc.py
@@ -59,9 +59,12 @@ def do_POST(self):
                                                       methodresponse=True)
 
             self.send_response(200)
-            self.send_header("Content-type", "application/xml")
+            self.send_header("Content-type", "application/xml; charset=UTF-8")
             self.end_headers()
-            self.wfile.write(response_body.encode('utf-8'))
+            try:
+                self.wfile.write(response_body.encode('utf-8'))
+            except UnicodeDecodeError:
+                self.wfile.write(response_body)
 
         except SoftLayer.SoftLayerAPIError as ex:
             self.send_response(200)

diff --git a/tests/CLI/helper_tests.py b/tests/CLI/helper_tests.py
@@ -88,12 +88,12 @@ def test_init(self):
         item = formatting.FormattedItem('test', 'test_formatted')
         self.assertEqual('test', item.original)
         self.assertEqual('test_formatted', item.formatted)
-        self.assertEqual('test', str(item))
+        self.assertEqual('test', item)
 
         item = formatting.FormattedItem('test')
         self.assertEqual('test', item.original)
         self.assertEqual('test', item.formatted)
-        self.assertEqual('test', str(item))
+        self.assertEqual('test', item)
 
     def test_mb_to_gb(self):
         item = formatting.mb_to_gb(1024)