Merge "Use getattr properly in legacy shell"

2013-02-27 01:26:42 +00:00
parent 8ec7468134 fbb858aa77
commit 0ca43be6fd
1 changed files with 3 additions and 2 deletions
@@ -266,8 +266,9 @@ def _get_images(gc, args):

    optional_kwargs = ['marker', 'sort_key', 'sort_dir']
    for kwarg in optional_kwargs:
-        if getattr(args, kwarg):
-            parameters[kwarg] = getattr(args.kwarg)
+        value = getattr(args, kwarg, None)
+        if value is not None:
+            parameters[kwarg] = value

    return gc.images.list(**parameters)