diff options
author | Rodney Ewing <ewing.rj@gmail.com> | 2013-08-01 10:23:37 -0700 |
---|---|---|
committer | Rodney Ewing <ewing.rj@gmail.com> | 2013-08-16 15:30:12 -0700 |
commit | aa387fc57ec1c176a739df8c5f4cedaf70ae9af1 (patch) | |
tree | bd6ca7a50b59199fb0e1cdfc6d24755564811978 /mediagoblin/gmg_commands/users.py | |
parent | e7c08e3550d19691d989d48d8d499eb7b2b9f80a (diff) | |
download | mediagoblin-aa387fc57ec1c176a739df8c5f4cedaf70ae9af1.tar.lz mediagoblin-aa387fc57ec1c176a739df8c5f4cedaf70ae9af1.tar.xz mediagoblin-aa387fc57ec1c176a739df8c5f4cedaf70ae9af1.zip |
use parser.parse_known_args() instead of parser.parse_args()
Diffstat (limited to 'mediagoblin/gmg_commands/users.py')
-rw-r--r-- | mediagoblin/gmg_commands/users.py | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/mediagoblin/gmg_commands/users.py b/mediagoblin/gmg_commands/users.py index e44b0aa9..c2a4dddb 100644 --- a/mediagoblin/gmg_commands/users.py +++ b/mediagoblin/gmg_commands/users.py @@ -32,16 +32,16 @@ def adduser_parser_setup(subparser): def adduser(args): #TODO: Lets trust admins this do not validate Emails :) - commands_util.setup_app(args) + commands_util.setup_app(args[0]) - args.username = commands_util.prompt_if_not_set(args.username, "Username:") - args.password = commands_util.prompt_if_not_set(args.password, "Password:",True) - args.email = commands_util.prompt_if_not_set(args.email, "Email:") + args[0].username = commands_util.prompt_if_not_set(args[0].username, "Username:") + args[0].password = commands_util.prompt_if_not_set(args[0].password, "Password:",True) + args[0].email = commands_util.prompt_if_not_set(args[0].email, "Email:") db = mg_globals.database users_with_username = \ db.User.query.filter_by( - username=args.username.lower() + username=args[0].username.lower() ).count() if users_with_username: @@ -50,9 +50,9 @@ def adduser(args): else: # Create the user entry = db.User() - entry.username = unicode(args.username.lower()) - entry.email = unicode(args.email) - entry.pw_hash = auth.gen_password_hash(args.password) + entry.username = unicode(args[0].username.lower()) + entry.email = unicode(args[0].email) + entry.pw_hash = auth.gen_password_hash(args[0].password) entry.status = u'active' entry.email_verified = True entry.save() @@ -67,12 +67,12 @@ def makeadmin_parser_setup(subparser): def makeadmin(args): - commands_util.setup_app(args) + commands_util.setup_app(args[0]) db = mg_globals.database user = db.User.query.filter_by( - username=unicode(args.username.lower())).one() + username=unicode(args[0].username.lower())).one() if user: user.is_admin = True user.save() @@ -91,14 +91,14 @@ def changepw_parser_setup(subparser): def changepw(args): - commands_util.setup_app(args) + commands_util.setup_app(args[0]) db = mg_globals.database user = db.User.query.filter_by( - username=unicode(args.username.lower())).one() + username=unicode(args[0].username.lower())).one() if user: - user.pw_hash = auth.gen_password_hash(args.password) + user.pw_hash = auth.gen_password_hash(args[0].password) user.save() print 'Password successfully changed' else: |