Merge pull request python-gitlab#835 from python-gitlab/bugfix-717

max-wittig · web-flow · commit 0b0a60fd72fc · 2019-07-21T19:29:56.000+02:00
fix(cli): don't fail when the short print attr value is None
diff --git a/gitlab/cli.py b/gitlab/cli.py
@@ -182,7 +182,7 @@ def main():
     if args.fields:
         fields = [x.strip() for x in args.fields.split(",")]
     debug = args.debug
-    action = args.action
+    action = args.whaction
     what = args.what
 
     args = args.__dict__
@@ -193,7 +193,7 @@ def main():
         "verbose",
         "debug",
         "what",
-        "action",
+        "whaction",
         "version",
         "output",
     ):
diff --git a/gitlab/tests/test_cli.py b/gitlab/tests/test_cli.py
@@ -116,7 +116,7 @@ def test_parse_args(self):
         parser = cli._get_parser(gitlab.v4.cli)
         args = parser.parse_args(["project", "list"])
         self.assertEqual(args.what, "project")
-        self.assertEqual(args.action, "list")
+        self.assertEqual(args.whaction, "list")
 
     def test_parser(self):
         parser = cli._get_parser(gitlab.v4.cli)
diff --git a/gitlab/v4/cli.py b/gitlab/v4/cli.py
@@ -312,7 +312,7 @@ def extend_parser(parser):
         object_group = subparsers.add_parser(arg_name)
 
         object_subparsers = object_group.add_subparsers(
-            title="action", dest="action", help="Action to execute."
+            title="action", dest="whaction", help="Action to execute."
         )
         _populate_sub_parser_by_class(cls, object_subparsers)
         object_subparsers.required = True
@@ -406,7 +406,7 @@ def display_dict(d, padding):
                 id = getattr(obj, obj._id_attr)
                 print("%s: %s" % (obj._id_attr.replace("_", "-"), id))
             if hasattr(obj, "_short_print_attr"):
-                value = getattr(obj, obj._short_print_attr)
+                value = getattr(obj, obj._short_print_attr) or "None"
                 value = value.replace("\r", "").replace("\n", " ")
                 # If the attribute is a note (ProjectCommitComment) then we do
                 # some modifications to fit everything on one line
