diff options
| -rw-r--r-- | django/contrib/comments/feeds.py | 4 | ||||
| -rw-r--r-- | django/contrib/comments/views/comments.py | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/django/contrib/comments/feeds.py b/django/contrib/comments/feeds.py index 34cf3d9cef..2f395318b6 100644 --- a/django/contrib/comments/feeds.py +++ b/django/contrib/comments/feeds.py @@ -11,7 +11,7 @@ class LatestFreeCommentsFeed(Feed): def title(self): if not hasattr(self, '_site'): self._site = Site.objects.get_current() - return "%s comments" % self._site.name + return u"%s comments" % self._site.name def link(self): if not hasattr(self, '_site'): @@ -21,7 +21,7 @@ class LatestFreeCommentsFeed(Feed): def description(self): if not hasattr(self, '_site'): self._site = Site.objects.get_current() - return "Latest comments on %s" % self._site.name + return u"Latest comments on %s" % self._site.name def items(self): return self.comments_class.objects.filter(site__pk=settings.SITE_ID, is_public=True)[:40] diff --git a/django/contrib/comments/views/comments.py b/django/contrib/comments/views/comments.py index d3c1d81e84..435bfa6f73 100644 --- a/django/contrib/comments/views/comments.py +++ b/django/contrib/comments/views/comments.py @@ -12,6 +12,7 @@ from django.http import HttpResponseRedirect from django.utils.text import normalize_newlines from django.conf import settings from django.utils.translation import ungettext, ugettext as _ +from django.utils.encoding import smart_unicode import base64, datetime COMMENTS_PER_PAGE = 20 @@ -248,7 +249,7 @@ def post_comment(request): # If the IP is banned, mail the admins, do NOT save the comment, and # serve up the "Thanks for posting" page as if the comment WAS posted. if request.META['REMOTE_ADDR'] in settings.BANNED_IPS: - mail_admins("Banned IP attempted to post comment", str(request.POST) + "\n\n" + str(request.META)) + mail_admins("Banned IP attempted to post comment", smart_unicode(request.POST) + "\n\n" + str(request.META)) else: manipulator.do_html2python(new_data) comment = manipulator.save(new_data) @@ -312,7 +313,7 @@ def post_free_comment(request): # serve up the "Thanks for posting" page as if the comment WAS posted. if request.META['REMOTE_ADDR'] in settings.BANNED_IPS: from django.core.mail import mail_admins - mail_admins("Practical joker", str(request.POST) + "\n\n" + str(request.META)) + mail_admins("Practical joker", smart_unicode(request.POST) + "\n\n" + str(request.META)) else: manipulator.do_html2python(new_data) comment = manipulator.save(new_data) |