This commit was the work I did fixing errors that cropped up from the merge.

There were a few errors because of the switch from sqlalchemy 0.7 to 0.8 but I
cleared them up.

1 files changed, 12 insertions, 8 deletions

diff --git a/mediagoblin/gmg_commands/users.py b/mediagoblin/gmg_commands/users.py
index ad8263e7..7e6fc5bc 100644
--- a/mediagoblin/gmg_commands/users.py
+++ b/mediagoblin/gmg_commands/users.py
@@ -56,11 +56,15 @@ def adduser(args):
         entry.status = u'active'
         entry.email_verified = True
         default_privileges = [ 
-            db.Privilege.one({'privilege_name':u'commenter'}),
-            db.Privilege.one({'privilege_name':u'uploader'}),
-            db.Privilege.one({'privilege_name':u'reporter'}),
-            db.Privilege.one({'privilege_name':u'active'})
-]
+            db.Privilege.query.filter(
+                db.Privilege.privilege_name==u'commenter').one(),
+            db.Privilege.query.filter(
+                db.Privilege.privilege_name==u'uploader').one(),
+            db.Privilege.query.filter(
+                db.Privilege.privilege_name==u'reporter').one(),
+            db.Privilege.query.filter(
+                db.Privilege.privilege_name==u'active').one()
+        ]
         entry.all_privileges = default_privileges
         entry.save()
 
@@ -83,9 +87,9 @@ def makeadmin(args):
     if user:
         user.is_admin = True
         user.all_privileges.append(
-            db.Privilege.one({
-                'privilege_name':u'admin'})
-            )
+            db.Privilege.query.filter(
+                db.Privilege.privilege_name==u'admin').one()
+        )
         user.save()
         print 'The user is now Admin'
     else: