From a42b4176e1cbf77c8e78ce2c3069fc93567d336b Mon Sep 17 00:00:00 2001 From: Kevin Van Brunt Date: Thu, 27 Sep 2018 14:49:57 -0400 Subject: Addressing code review comments --- cmd2/parsing.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cmd2/parsing.py') diff --git a/cmd2/parsing.py b/cmd2/parsing.py index 949be42e..fe08420a 100644 --- a/cmd2/parsing.py +++ b/cmd2/parsing.py @@ -308,7 +308,7 @@ class StatementParser: valid, errmsg = statement_parser.is_valid_command('>') if not valid: - errmsg = "Aliases {}".format(errmsg) + errmsg = "Alias {}".format(errmsg) """ valid = False -- cgit v1.2.1 From d0f3a6078c944cbfd1406a5e2f01f9cf56f2f5c1 Mon Sep 17 00:00:00 2001 From: Kevin Van Brunt Date: Thu, 27 Sep 2018 14:53:13 -0400 Subject: Refactored --- cmd2/parsing.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cmd2/parsing.py') diff --git a/cmd2/parsing.py b/cmd2/parsing.py index fe08420a..9b86b487 100644 --- a/cmd2/parsing.py +++ b/cmd2/parsing.py @@ -315,10 +315,10 @@ class StatementParser: if not word: return False, 'cannot be an empty string' - errmsg = 'cannot start with a shortcut: ' - errmsg += ', '.join(shortcut for (shortcut, expansion) in self.shortcuts) for (shortcut, expansion) in self.shortcuts: if word.startswith(shortcut): + errmsg = 'cannot start with a shortcut: ' + errmsg += ', '.join(shortcut for (shortcut, expansion) in self.shortcuts) return False, errmsg errmsg = 'cannot contain: whitespace, quotes, ' -- cgit v1.2.1 From 75f0ae0b0beb47495e6f45a193f68a9c49357648 Mon Sep 17 00:00:00 2001 From: Kevin Van Brunt Date: Thu, 27 Sep 2018 19:20:24 -0400 Subject: Changes requested in code review --- cmd2/parsing.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cmd2/parsing.py') diff --git a/cmd2/parsing.py b/cmd2/parsing.py index 9b86b487..27d17d21 100644 --- a/cmd2/parsing.py +++ b/cmd2/parsing.py @@ -59,7 +59,7 @@ class Macro: required_arg_count = attr.ib(validator=attr.validators.instance_of(int)) # Used to fill in argument placeholders in the macro - arg_list = attr.ib(factory=list, validator=attr.validators.instance_of(list)) + arg_list = attr.ib(default=attr.Factory(list), validator=attr.validators.instance_of(list)) @attr.s(frozen=True) -- cgit v1.2.1