Mercurial > public > sg101
diff gpp/forums/views/spam.py @ 316:767cedc7d12a
Fixing #144; integrate with new Django logging support. Also added unit tests for Donations app.
| author | Brian Neal <bgneal@gmail.com> |
|---|---|
| date | Sun, 30 Jan 2011 20:02:32 +0000 |
| parents | a46788862737 |
| children | d1b11096595b |
line wrap: on
line diff
--- a/gpp/forums/views/spam.py Sat Jan 29 20:39:55 2011 +0000 +++ b/gpp/forums/views/spam.py Sun Jan 30 20:02:32 2011 +0000 @@ -69,7 +69,7 @@ if request.method == "POST" and can_moderate and can_deactivate: deactivate_spammer(poster) - email_admins(SPAMMER_NAILED_SUBJECT % poster.username, + email_admins(SPAMMER_NAILED_SUBJECT % poster.username, SPAMMER_NAILED_MSG_BODY % ( request.user.username, poster.username)) @@ -78,8 +78,8 @@ IP: %s Message: %s - """ % (request.user.username, poster.username, post.user_ip, - post.body))) + """), + request.user.username, poster.username, post.user_ip, post.body) return HttpResponseRedirect(reverse('forums-spammer_nailed', args=[ poster.id])) @@ -126,8 +126,8 @@ if request.method == "POST" and can_moderate and can_promote: promote_stranger(poster) - logging.info("STRANGER PROMOTED: %s promoted %s." % ( - request.user.username, poster.username)) + logging.info("STRANGER PROMOTED: %s promoted %s.", + request.user.username, poster.username) return HttpResponseRedirect(post.get_absolute_url())