diff options
author | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-08-12 11:13:00 -0500 |
---|---|---|
committer | Rodney Ewing <ewing.rj@gmail.com> | 2013-08-16 15:30:17 -0700 |
commit | ff12ecef347d0fdb29534eb2bc0390cf183c10ba (patch) | |
tree | dd027adea346e60d35383131b380778ce44676cb /mediagoblin/gmg_commands/users.py | |
parent | 98d1fa3beddfc602c541fe7f538ca882ad6c7e9c (diff) | |
download | mediagoblin-ff12ecef347d0fdb29534eb2bc0390cf183c10ba.tar.lz mediagoblin-ff12ecef347d0fdb29534eb2bc0390cf183c10ba.tar.xz mediagoblin-ff12ecef347d0fdb29534eb2bc0390cf183c10ba.zip |
Revert "use parser.parse_known_args() instead of parser.parse_args()"
This reverts commit 029e779c468ba1a6bfd893679cfaae7f418f45dd.
(and a bit more!)
This wasn't needed anymore because we did a "rest" capture and passed
that over to the reprocess run command.
Conflicts:
mediagoblin/gmg_commands/assetlink.py
mediagoblin/gmg_commands/dbupdate.py
mediagoblin/gmg_commands/import_export.py
mediagoblin/gmg_commands/users.py
Diffstat (limited to 'mediagoblin/gmg_commands/users.py')
-rw-r--r-- | mediagoblin/gmg_commands/users.py | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/mediagoblin/gmg_commands/users.py b/mediagoblin/gmg_commands/users.py index b164e672..e44b0aa9 100644 --- a/mediagoblin/gmg_commands/users.py +++ b/mediagoblin/gmg_commands/users.py @@ -32,17 +32,16 @@ def adduser_parser_setup(subparser): def adduser(args): #TODO: Lets trust admins this do not validate Emails :) - commands_util.check_unrecognized_args(args) - commands_util.setup_app(args[0]) + commands_util.setup_app(args) - 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:") + 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:") db = mg_globals.database users_with_username = \ db.User.query.filter_by( - username=args[0].username.lower() + username=args.username.lower() ).count() if users_with_username: @@ -51,9 +50,9 @@ def adduser(args): else: # Create the user entry = db.User() - entry.username = unicode(args[0].username.lower()) - entry.email = unicode(args[0].email) - entry.pw_hash = auth.gen_password_hash(args[0].password) + entry.username = unicode(args.username.lower()) + entry.email = unicode(args.email) + entry.pw_hash = auth.gen_password_hash(args.password) entry.status = u'active' entry.email_verified = True entry.save() @@ -68,13 +67,12 @@ def makeadmin_parser_setup(subparser): def makeadmin(args): - commands_util.check_unrecognized_args(args) - commands_util.setup_app(args[0]) + commands_util.setup_app(args) db = mg_globals.database user = db.User.query.filter_by( - username=unicode(args[0].username.lower())).one() + username=unicode(args.username.lower())).one() if user: user.is_admin = True user.save() @@ -93,15 +91,14 @@ def changepw_parser_setup(subparser): def changepw(args): - commands_util.check_unrecognized_args(args) - commands_util.setup_app(args[0]) + commands_util.setup_app(args) db = mg_globals.database user = db.User.query.filter_by( - username=unicode(args[0].username.lower())).one() + username=unicode(args.username.lower())).one() if user: - user.pw_hash = auth.gen_password_hash(args[0].password) + user.pw_hash = auth.gen_password_hash(args.password) user.save() print 'Password successfully changed' else: |