aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/gmg_commands/users.py
diff options
context:
space:
mode:
authorElrond <elrond+mediagoblin.org@samba-tng.org>2011-12-12 18:53:03 +0100
committerElrond <elrond+mediagoblin.org@samba-tng.org>2011-12-12 18:53:03 +0100
commitd44140a212fddab3301cbf3a97d3197f8879277b (patch)
treeedc8f09b0e476fc78472b469fdda6adda33b4dc2 /mediagoblin/gmg_commands/users.py
parent6ae878e730e006ab674f12c581af8447a0994a9f (diff)
parentddc1cae9ea4c80415557ec0408a56a3a1c60423b (diff)
downloadmediagoblin-d44140a212fddab3301cbf3a97d3197f8879277b.tar.lz
mediagoblin-d44140a212fddab3301cbf3a97d3197f8879277b.tar.xz
mediagoblin-d44140a212fddab3301cbf3a97d3197f8879277b.zip
Merge branch 'sql/dot-notation'
* sql/dot-notation: Dot-Notation for MediaEntry.media_data Dot-Notation for MediaEntry.media_type Dot-Notation for MediaEntry.description(_html) Dot-Notation for MediaEntry.slug Dot-Notation for MediaEntry.title Dot-Notation for MediaEntry.uploader Dot-Notation for MediaEntry.created Dot-Notation: tests/test_edit.py Dot-Notation for Users.fp_token_expire Dot-Notation for Users.fp_verification_key Dot-Notation for Users.bio and .bio_html Dot-Notation for Users.url Dot-Notation for Users.is_admin Dot-Notation for Users.verification_key Dot-Notation for Users.status Dot-Notation for Users.email_verified Dot-Notation for Users.pw_hash Dot-Notation for Users.email Dot-Notation for Users.username
Diffstat (limited to 'mediagoblin/gmg_commands/users.py')
-rw-r--r--mediagoblin/gmg_commands/users.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/mediagoblin/gmg_commands/users.py b/mediagoblin/gmg_commands/users.py
index b437e839..4bfe30a5 100644
--- a/mediagoblin/gmg_commands/users.py
+++ b/mediagoblin/gmg_commands/users.py
@@ -50,11 +50,11 @@ 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_lib.bcrypt_gen_password_hash(args.password)
- entry['status'] = u'active'
- entry['email_verified'] = True
+ 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.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: