diff options
Diffstat (limited to 'mediagoblin/moderation')
| -rw-r--r-- | mediagoblin/moderation/forms.py | 24 | ||||
| -rw-r--r-- | mediagoblin/moderation/tools.py | 24 | ||||
| -rw-r--r-- | mediagoblin/moderation/views.py | 14 |
3 files changed, 31 insertions, 31 deletions
diff --git a/mediagoblin/moderation/forms.py b/mediagoblin/moderation/forms.py index e46cfd36..22f2a759 100644 --- a/mediagoblin/moderation/forms.py +++ b/mediagoblin/moderation/forms.py @@ -18,10 +18,10 @@ import wtforms from mediagoblin.tools.translate import lazy_pass_to_ugettext as _ ACTION_CHOICES = [ - (u'takeaway', _(u'Take away privilege')), - (u'userban', _(u'Ban the user')), - (u'sendmessage', _(u'Send the user a message')), - (u'delete', _(u'Delete the content'))] + ('takeaway', _('Take away privilege')), + ('userban', _('Ban the user')), + ('sendmessage', _('Send the user a message')), + ('delete', _('Delete the content'))] class MultiCheckboxField(wtforms.SelectMultipleField): """ @@ -50,11 +50,11 @@ class BanForm(wtforms.Form): This form is used by an admin to ban a user directly from their user page. """ user_banned_until = wtforms.DateField( - _(u'User will be banned until:'), + _('User will be banned until:'), format='%Y-%m-%d', validators=[wtforms.validators.optional()]) why_user_was_banned = wtforms.TextAreaField( - _(u'Why are you banning this User?'), + _('Why are you banning this User?'), validators=[wtforms.validators.optional()]) # =========== Forms for mediagoblin.moderation.report page ================= # @@ -106,26 +106,26 @@ class ReportResolutionForm(wtforms.Form): -ved the report in such a way. """ action_to_resolve = MultiCheckboxField( - _(u'What action will you take to resolve the report?'), + _('What action will you take to resolve the report?'), validators=[wtforms.validators.optional()], choices=ACTION_CHOICES) targeted_user = wtforms.HiddenField('', validators=[wtforms.validators.required()]) take_away_privileges = wtforms.SelectMultipleField( - _(u'What privileges will you take away?'), + _('What privileges will you take away?'), validators=[wtforms.validators.optional()]) user_banned_until = wtforms.DateField( - _(u'User will be banned until:'), + _('User will be banned until:'), format='%Y-%m-%d', validators=[wtforms.validators.optional()]) why_user_was_banned = wtforms.TextAreaField( - _(u'Why user was banned:'), + _('Why user was banned:'), validators=[wtforms.validators.optional()]) message_to_user = wtforms.TextAreaField( - _(u'Message to user:'), + _('Message to user:'), validators=[wtforms.validators.optional()]) resolution_content = wtforms.TextAreaField( - _(u'Resolution content:')) + _('Resolution content:')) # ======== Forms for mediagoblin.moderation.report_panel page ============== # diff --git a/mediagoblin/moderation/tools.py b/mediagoblin/moderation/tools.py index 36d89d71..2e85a238 100644 --- a/mediagoblin/moderation/tools.py +++ b/mediagoblin/moderation/tools.py @@ -30,24 +30,24 @@ def take_punitive_actions(request, form, report, user): # The bulk of this action is running through all of the different # punitive actions that a moderator could take. - if u'takeaway' in form.action_to_resolve.data: + if 'takeaway' in form.action_to_resolve.data: for privilege_name in form.take_away_privileges.data: take_away_privileges(user.username, privilege_name) form.resolution_content.data += \ - _(u"\n{mod} took away {user}\'s {privilege} privileges.").format( + _("\n{mod} took away {user}\'s {privilege} privileges.").format( mod=request.user.username, user=user.username, privilege=privilege_name) # If the moderator elects to ban the user, a new instance of user_ban # will be created. - if u'userban' in form.action_to_resolve.data: + if 'userban' in form.action_to_resolve.data: user_ban = ban_user(form.targeted_user.data, expiration_date=form.user_banned_until.data, reason=form.why_user_was_banned.data) Session.add(user_ban) form.resolution_content.data += \ - _(u"\n{mod} banned user {user} {expiration_date}.").format( + _("\n{mod} banned user {user} {expiration_date}.").format( mod=request.user.username, user=user.username, expiration_date = ( @@ -59,26 +59,26 @@ def take_punitive_actions(request, form, report, user): # If the moderator elects to send a warning message. An email will be # sent to the email address given at sign up - if u'sendmessage' in form.action_to_resolve.data: + if 'sendmessage' in form.action_to_resolve.data: message_body = form.message_to_user.data form.resolution_content.data += \ - _(u"\n{mod} sent a warning email to the {user}.").format( + _("\n{mod} sent a warning email to the {user}.").format( mod=request.user.username, user=user.username) - if u'delete' in form.action_to_resolve.data and \ + if 'delete' in form.action_to_resolve.data and \ report.is_comment_report(): deleted_comment = report.obj() deleted_comment.delete() form.resolution_content.data += \ - _(u"\n{mod} deleted the comment.").format( + _("\n{mod} deleted the comment.").format( mod=request.user.username) - elif u'delete' in form.action_to_resolve.data and \ + elif 'delete' in form.action_to_resolve.data and \ report.is_media_entry_report(): deleted_media = report.obj() deleted_media.delete() form.resolution_content.data += \ - _(u"\n{mod} deleted the media entry.").format( + _("\n{mod} deleted the media entry.").format( mod=request.user.username) report.archive( resolver_id=request.user.id, @@ -216,7 +216,7 @@ def parse_report_panel_settings(form): filters['reported_user_id'] = form.reported_user.data filters['reporter_id'] = form.reporter.data - filters = dict((k, v) - for k, v in six.iteritems(filters) if v) + filters = {k: v + for k, v in filters.items() if v} return filters diff --git a/mediagoblin/moderation/views.py b/mediagoblin/moderation/views.py index ca0e6533..90a7e95f 100644 --- a/mediagoblin/moderation/views.py +++ b/mediagoblin/moderation/views.py @@ -32,14 +32,14 @@ def moderation_media_processing_panel(request): ''' Show the global media processing panel for this instance ''' - processing_entries = MediaEntry.query.filter_by(state = u'processing').\ + processing_entries = MediaEntry.query.filter_by(state = 'processing').\ order_by(MediaEntry.created.desc()) # Get media entries which have failed to process - failed_entries = MediaEntry.query.filter_by(state = u'failed').\ + failed_entries = MediaEntry.query.filter_by(state = 'failed').\ order_by(MediaEntry.created.desc()) - processed_entries = MediaEntry.query.filter_by(state = u'processed').\ + processed_entries = MediaEntry.query.filter_by(state = 'processed').\ order_by(MediaEntry.created.desc()).limit(10) # Render to response @@ -163,8 +163,8 @@ def moderation_reports_detail(request): ] if request.method == "POST" and form.validate() and not ( - not request.user.has_privilege(u'admin') and - report.reported_user.has_privilege(u'admin')): + not request.user.has_privilege('admin') and + report.reported_user.has_privilege('admin')): user = User.query.get(form.targeted_user.data) return take_punitive_actions(request, form, report, user) @@ -178,7 +178,7 @@ def moderation_reports_detail(request): {'report':report, 'form':form}) -@user_has_privilege(u'admin') +@user_has_privilege('admin') @active_user_from_url def give_or_take_away_privilege(request, url_user): ''' @@ -200,7 +200,7 @@ def give_or_take_away_privilege(request, url_user): 'mediagoblin.moderation.users_detail', user=url_user.username) -@user_has_privilege(u'admin') +@user_has_privilege('admin') @active_user_from_url def ban_or_unban(request, url_user): """ |