Merge branch 'master' into derek-moore-bug405_email_notifications_for_comments

[mediagoblin.git] / mediagoblin / gmg_commands / users.py

diff --git a/mediagoblin/gmg_commands/users.py b/mediagoblin/gmg_commands/users.py
index 04d88e23d15fdd2e4802f3f4c65fab849c708be7..70e591c92203ae52efe03935d87e32910cb4e73c 100644 (file)
--- a/mediagoblin/gmg_commands/users.py
+++ b/mediagoblin/gmg_commands/users.py
@@ -1,5 +1,5 @@
 # GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011 MediaGoblin contributors.  See AUTHORS.
+# Copyright (C) 2011, 2012 MediaGoblin contributors.  See AUTHORS.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -52,9 +52,9 @@ def adduser(args):
         entry = db.User()
         entry.username = unicode(args.username.lower())
         entry.email = unicode(args.email)
-        entry['pw_hash'] = auth_lib.bcrypt_gen_password_hash(args.password)
-        entry['status'] = u'active'
-        entry['email_verified'] = True
+        entry.pw_hash = auth_lib.bcrypt_gen_password_hash(args.password)
+        entry.status = u'active'
+        entry.email_verified = True
         entry.save(validate=True)
 
         print "User created (and email marked as verified)"
@@ -73,7 +73,7 @@ def makeadmin(args):
 
     user = db.User.one({'username': unicode(args.username.lower())})
     if user:
-        user['is_admin'] = True
+        user.is_admin = True
         user.save()
         print 'The user is now Admin'
     else:
@@ -96,7 +96,7 @@ def changepw(args):
 
     user = db.User.one({'username': unicode(args.username.lower())})
     if user:
-        user['pw_hash'] = auth_lib.bcrypt_gen_password_hash(args.password)
+        user.pw_hash = auth_lib.bcrypt_gen_password_hash(args.password)
         user.save()
         print 'Password successfully changed'
     else: