From fe65ec269621f8b84a3d530de4fb2a368f721515 Mon Sep 17 00:00:00 2001 From: Tim Van Baak Date: Tue, 28 Jan 2020 13:14:24 -0800 Subject: [PATCH] Remove obsolete tl_user check --- amanuensis/cli/helpers.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/amanuensis/cli/helpers.py b/amanuensis/cli/helpers.py index 508e58d..f925c4a 100644 --- a/amanuensis/cli/helpers.py +++ b/amanuensis/cli/helpers.py @@ -81,7 +81,9 @@ def requires_lexicon(command): return augmented_command USER_ARGS = ['--user'] -USER_KWARGS = {'metavar': 'USER', 'dest': 'user', +USER_KWARGS = { + 'metavar': 'USER', + 'dest': 'user', 'help': 'Specify a user to operate on'} def requires_user(command): """ @@ -100,18 +102,19 @@ def requires_user(command): return None # Verify user argument in execute pass - base_val = (hasattr(cmd_args, "tl_user") - and getattr(cmd_args, "tl_user")) - subp_val = (hasattr(cmd_args, "user") + val = ((hasattr(cmd_args, "user") and getattr(cmd_args, "user")) - val = subp_val or base_val or None + or None) if not val: from amanuensis.config import logger logger.error("This command requires specifying a user") return -1 from amanuensis.user import UserModel - cmd_args.user = UserModel.by(name=val) - # TODO more thorough verification of argument val + cmd_args.user = UserModel.by(name=val) #TODO catch specific exceptions + if cmd_args.user is None: + from amanuensis.config import logger + logger.error('Could not find user "{}"'.format(val)) + return -1 return command(cmd_args) augmented_command.__dict__['wrapper'] = True