Merge pull request #1178 from allmightyspiff/rest_fixes

#962 fixed image list in rest

Author: allmightyspiff

SoftLayer/CLI/image/list.py

@@ -12,9 +12,7 @@
 
 @click.command()
 @click.option('--name', default=None, help='Filter on image name')
-@click.option('--public/--private',
-              is_flag=True,
-              default=None,
+@click.option('--public/--private', is_flag=True, default=None,
               help='Display only public or private images')
 @environment.pass_env
 def cli(env, name, public):
@@ -24,30 +22,22 @@ def cli(env, name, public):
 
     images = []
     if public in [False, None]:
-        for image in image_mgr.list_private_images(name=name,
-                                                   mask=image_mod.MASK):
+        for image in image_mgr.list_private_images(name=name, mask=image_mod.MASK):
             images.append(image)
 
     if public in [True, None]:
-        for image in image_mgr.list_public_images(name=name,
-                                                  mask=image_mod.MASK):
+        for image in image_mgr.list_public_images(name=name, mask=image_mod.MASK):
             images.append(image)
 
-    table = formatting.Table(['id',
-                              'name',
-                              'type',
-                              'visibility',
-                              'account'])
+    table = formatting.Table(['id', 'name', 'type', 'visibility', 'account'])
 
-    images = [image for image in images if image['parentId'] == '']
+    images = [image for image in images if not image['parentId']]
     for image in images:
 
-        visibility = (image_mod.PUBLIC_TYPE if image['publicFlag']
-                      else image_mod.PRIVATE_TYPE)
+        visibility = (image_mod.PUBLIC_TYPE if image['publicFlag'] else image_mod.PRIVATE_TYPE)
         table.add_row([
             image.get('id', formatting.blank()),
-            formatting.FormattedItem(image['name'],
-                                     click.wrap_text(image['name'], width=50)),
+            formatting.FormattedItem(image['name'], click.wrap_text(image['name'], width=50)),
             formatting.FormattedItem(
                 utils.lookup(image, 'imageType', 'keyName'),
                 utils.lookup(image, 'imageType', 'name')),