Skip to content

Commit fc328e5

Browse files
committed
arguments-renamed
1 parent eb55296 commit fc328e5

File tree

4 files changed

+28
-29
lines changed

4 files changed

+28
-29
lines changed

pylintrc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ disable=
4040
consider-using-f-string,
4141
unspecified-encoding,
4242
use-maxsplit-arg,
43-
arguments-renamed,
4443
consider-using-in,
4544
use-dict-literal,
4645
consider-using-dict-items,

src/azure-cli-core/azure/cli/core/commands/__init__.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1291,13 +1291,13 @@ def _flatten_kwargs(self, kwargs, default_source_name):
12911291
return merged_kwargs
12921292

12931293
# pylint: disable=arguments-differ
1294-
def command(self, name, method_name=None, **kwargs):
1294+
def command(self, name, handler_name=None, **kwargs):
12951295
"""
12961296
Register a CLI command.
12971297
:param name: Name of the command as it will be called on the command line
12981298
:type name: str
1299-
:param method_name: Name of the method the command maps to
1300-
:type method_name: str
1299+
:param handler_name: Name of the method the command maps to
1300+
:type handler_name: str
13011301
:param kwargs: Keyword arguments. Supported keyword arguments include:
13021302
- client_factory: Callable which returns a client needed to access the underlying command method. (function)
13031303
- confirmation: Prompt prior to the action being executed. This is useful if the action
@@ -1314,7 +1314,7 @@ def command(self, name, method_name=None, **kwargs):
13141314
- max_api: Maximum API version required for commands within the group (string)
13151315
:rtype: None
13161316
"""
1317-
return self._command(name, method_name=method_name, **kwargs)
1317+
return self._command(name, method_name=handler_name, **kwargs)
13181318

13191319
def custom_command(self, name, method_name=None, **kwargs):
13201320
"""

src/azure-cli-core/azure/cli/core/commands/parameters.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ def _ignore_if_not_registered(self, dest):
366366
super(AzArgumentContext, self).argument(dest, arg_type=ignore_type)
367367

368368
# pylint: disable=arguments-differ
369-
def argument(self, dest, arg_type=None, **kwargs):
369+
def argument(self, argument_dest, arg_type=None, **kwargs):
370370
self._check_stale()
371371
if not self._applicable():
372372
return
@@ -384,11 +384,11 @@ def argument(self, dest, arg_type=None, **kwargs):
384384
min_api=min_api,
385385
max_api=max_api,
386386
operation_group=operation_group):
387-
super(AzArgumentContext, self).argument(dest, **merged_kwargs)
387+
super(AzArgumentContext, self).argument(argument_dest, **merged_kwargs)
388388
else:
389-
self._ignore_if_not_registered(dest)
389+
self._ignore_if_not_registered(argument_dest)
390390

391-
def positional(self, dest, arg_type=None, **kwargs):
391+
def positional(self, argument_dest, arg_type=None, **kwargs):
392392
self._check_stale()
393393
if not self._applicable():
394394
return
@@ -405,9 +405,9 @@ def positional(self, dest, arg_type=None, **kwargs):
405405
min_api=min_api,
406406
max_api=max_api,
407407
operation_group=operation_group):
408-
super(AzArgumentContext, self).positional(dest, **merged_kwargs)
408+
super(AzArgumentContext, self).positional(argument_dest, **merged_kwargs)
409409
else:
410-
self._ignore_if_not_registered(dest)
410+
self._ignore_if_not_registered(argument_dest)
411411

412412
def expand(self, dest, model_type, group_name=None, patches=None):
413413
# TODO:
@@ -475,7 +475,7 @@ def ignore(self, *args):
475475
for arg in args:
476476
super(AzArgumentContext, self).ignore(arg)
477477

478-
def extra(self, dest, arg_type=None, **kwargs):
478+
def extra(self, argument_dest, arg_type=None, **kwargs):
479479

480480
merged_kwargs = self._flatten_kwargs(kwargs, arg_type)
481481
resource_type = merged_kwargs.get('resource_type', None)
@@ -487,8 +487,8 @@ def extra(self, dest, arg_type=None, **kwargs):
487487
max_api=max_api,
488488
operation_group=operation_group):
489489
# Restore when knack #132 is fixed
490-
# merged_kwargs.pop('dest', None)
491-
# super(AzArgumentContext, self).extra(dest, **merged_kwargs)
490+
# merged_kwargs.pop('argument_dest', None)
491+
# super(AzArgumentContext, self).extra(argument_dest, **merged_kwargs)
492492
from knack.arguments import CLICommandArgument
493493
self._check_stale()
494494
if not self._applicable():
@@ -497,11 +497,11 @@ def extra(self, dest, arg_type=None, **kwargs):
497497
if self.command_scope in self.command_loader.command_group_table:
498498
raise ValueError("command authoring error: extra argument '{}' cannot be registered to a group-level "
499499
"scope '{}'. It must be registered to a specific command.".format(
500-
dest, self.command_scope))
500+
argument_dest, self.command_scope))
501501

502-
deprecate_action = self._handle_deprecations(dest, **merged_kwargs)
502+
deprecate_action = self._handle_deprecations(argument_dest, **merged_kwargs)
503503
if deprecate_action:
504504
merged_kwargs['action'] = deprecate_action
505505
merged_kwargs.pop('dest', None)
506-
self.command_loader.extra_argument_registry[self.command_scope][dest] = CLICommandArgument(
507-
dest, **merged_kwargs)
506+
self.command_loader.extra_argument_registry[self.command_scope][argument_dest] = CLICommandArgument(
507+
argument_dest, **merged_kwargs)

src/azure-cli/azure/cli/command_modules/ams/_utils.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -60,22 +60,22 @@ class JsonBytearrayEncoder(json.JSONEncoder):
6060
DATE_FORMAT = "%Y-%m-%d"
6161
TIME_FORMAT = "%H:%M:%S"
6262

63-
def default(self, obj): # pylint: disable=E0202,W0221
64-
if isinstance(obj, datetime):
65-
return obj.strftime("%s %s" % (self.DATE_FORMAT, self.TIME_FORMAT))
63+
def default(self, o): # pylint: disable=E0202,W0221
64+
if isinstance(o, datetime):
65+
return o.strftime("%s %s" % (self.DATE_FORMAT, self.TIME_FORMAT))
6666

67-
if isinstance(obj, bytearray):
68-
return bytes(obj).decode('utf-8', 'ignore')
67+
if isinstance(o, bytearray):
68+
return bytes(o).decode('utf-8', 'ignore')
6969

7070
try:
71-
return obj.toJSON()
71+
return o.toJSON()
7272
except Exception: # pylint: disable=W0703
73-
obj = vars(obj)
74-
obj.pop('additional_properties', None)
75-
keys = list(obj.keys())
73+
o = vars(o)
74+
o.pop('additional_properties', None)
75+
keys = list(o.keys())
7676
for key in keys:
77-
obj[snake_to_camel_case(key)] = obj.pop(key)
78-
return obj
77+
o[snake_to_camel_case(key)] = o.pop(key)
78+
return o
7979

8080

8181
def create_ip_range(resource_name, ip):

0 commit comments

Comments
 (0)