Merge remote-tracking branch 'tilly-q/OPW-Moderation-Update' into merge-tillyq-moderation

1 files changed, 9 insertions, 5 deletions

diff --git a/mediagoblin/db/migrations.py b/mediagoblin/db/migrations.py
index bd615614..0356c672 100644
--- a/mediagoblin/db/migrations.py
+++ b/mediagoblin/db/migrations.py
@@ -653,24 +653,28 @@ def create_moderation_tables(db):
     ]
 
     # Give each user the appopriate privileges depending whether they are an
-    # admin, an active user or an inactivated user ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    # admin, an active user or an inactive user ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     for admin_user in admin_users_ids:
         admin_user_id = admin_user['id']
-        for privilege_id in [admin_privilege_id, uploader_privilege_id, reporter_privilege_id, commenter_privilege_id, active_privilege_id]:
+        for privilege_id in [admin_privilege_id, uploader_privilege_id, 
+                            reporter_privilege_id, commenter_privilege_id, 
+                            active_privilege_id]:
             db.execute(user_privilege_assoc.insert().values(
                 core__privilege_id=admin_user_id,
                 core__user_id=privilege_id))
 
     for active_user in active_users_ids:
         active_user_id = active_user['id']
-        for privilege_id in [uploader_privilege_id, reporter_privilege_id, commenter_privilege_id, active_privilege_id]:
+        for privilege_id in [uploader_privilege_id, reporter_privilege_id, 
+                            commenter_privilege_id, active_privilege_id]:
             db.execute(user_privilege_assoc.insert().values(
                 core__privilege_id=active_user_id,
                 core__user_id=privilege_id))
 
     for inactive_user in inactive_users_ids:
         inactive_user_id = inactive_user['id']
-        for privilege_id in [uploader_privilege_id, reporter_privilege_id, commenter_privilege_id]:
+        for privilege_id in [uploader_privilege_id, reporter_privilege_id, 
+                             commenter_privilege_id]:
             db.execute(user_privilege_assoc.insert().values(
                 core__privilege_id=inactive_user_id,
                 core__user_id=privilege_id))
@@ -706,7 +710,7 @@ def create_moderation_tables(db):
         db.commit()
         new_user_table.rename("core__users")
     else:
-        # If the db is not SQLite, this process is much simpler ~~~~~~~~~~~~~~~
+        # If the db is not run using SQLite, this process is much simpler ~~~~~
 
         status = user_table.columns['status']
         email_verified = user_table.columns['email_verified']