Fix for #717: Rename of conflicting 'action' attribute; fallback for … · python-gitlab/python-gitlab@eee4cce · GitHub

1. python-gitlab
2. python-gitlab

Repository navigation

• Code
• Issues16 (16)
• Pull requests15 (15)
• Discussions
• Actions
• Projects
• Security and quality
• Insights

Commit eee4cce

Browse filesBrowse the repository at this point in the historyBrowse files

xarx00

committed

Fix for #717: Rename of conflicting 'action' attribute; fallback for missing Event parameters.

1 parent 1792442 commit eee4cce
Copy full SHA for eee4cce

3 files changed

+5-5Lines changed: 5 additions & 5 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• gitlab
  • cli.py
  • tests
    • test_cli.py
  • v4
    • cli.py

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎gitlab/cli.py‎

Copy file name to clipboardExpand all lines: gitlab/cli.py

+2-2Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -165,12 +165,12 @@ def main():
165	165	if args.fields:
166	166	fields = [x.strip() for x in args.fields.split(',')]
167	167	debug = args.debug
168		- action = args.action
	168	+ action = args.whaction
169	169	what = args.what
170	170
171	171	args = args.__dict__
172	172	# Remove CLI behavior-related args
173		- for item in ('gitlab', 'config_file', 'verbose', 'debug', 'what', 'action',
	173	+ for item in ('gitlab', 'config_file', 'verbose', 'debug', 'what', 'whaction',
174	174	'version', 'output'):
175	175	args.pop(item)
176	176	args = {k: _parse_value(v) for k, v in args.items() if v is not None}

Collapse file

‎gitlab/tests/test_cli.py‎

Copy file name to clipboardExpand all lines: gitlab/tests/test_cli.py

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -111,7 +111,7 @@ def test_parse_args(self):
111	111	parser = cli._get_parser(gitlab.v4.cli)
112	112	args = parser.parse_args(['project', 'list'])
113	113	self.assertEqual(args.what, 'project')
114		- self.assertEqual(args.action, 'list')
	114	+ self.assertEqual(args.whaction, 'list')
115	115
116	116	def test_parser(self):
117	117	parser = cli._get_parser(gitlab.v4.cli)

Collapse file

‎gitlab/v4/cli.py‎

Copy file name to clipboardExpand all lines: gitlab/v4/cli.py

+2-2Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -273,7 +273,7 @@ def extend_parser(parser):
273	273
274	274	object_subparsers = object_group.add_subparsers(
275	275	title='action',
276		- dest='action', help="Action to execute.")
	276	+ dest='whaction', help="Action to execute.")
277	277	_populate_sub_parser_by_class(cls, object_subparsers)
278	278	object_subparsers.required = True
279	279
@@ -357,7 +357,7 @@ def display_dict(d, padding):
357	357	id = getattr(obj, obj._id_attr)
358	358	print('%s: %s' % (obj._id_attr.replace('_', '-'), id))
359	359	if hasattr(obj, '_short_print_attr'):
360		- value = getattr(obj, obj._short_print_attr)
	360	+ value = getattr(obj, obj._short_print_attr) or 'None'
361	361	value = value.replace('\r', '').replace('\n', ' ')
362	362	# If the attribute is a note (ProjectCommitComment) then we do
363	363	# some modifications to fit everything on one line

0 commit comments

Comments

0 (0)