Merge lp:~zematynnad/rnr-server/non_ascii_741909 into lp:rnr-server

[Danny Tamez]

[r=noodles][bug=741909] template_tag was formatting an ascii string with unicode parameters and blowing up. Now using a unicode string.

template_tag was formatting an ascii string with unicode parameters and blowing up. Now using a unicode string. Added a test for this condition.

This was blocking use of the moderation view for QA - so... they should be able to get to it now.

[Michael Nelson (michael.nelson)]

Wonderful.... thanks Danny!

review: Approve

=== modified file 'src/reviewsapp/templatetags/reviewsapp.py'
--- src/reviewsapp/templatetags/reviewsapp.py	2011-03-23 16:21:12 +0000
+++ src/reviewsapp/templatetags/reviewsapp.py	2011-03-24 19:56:36 +0000
@@ -49,7 +49,7 @@
     if name == "":
         name = user.username
 
-    result = '<a href="https://launchpad.net/~{0}">{1}</a>'.format(
+    result = u'<a href="https://launchpad.net/~{0}">{1}</a>'.format(
         escape(user.username), escape(name))
     return mark_safe(result)
 lp_user.needs_autoescape = True

=== modified file 'src/reviewsapp/tests/test_views.py'
--- src/reviewsapp/tests/test_views.py	2011-03-23 16:21:12 +0000
+++ src/reviewsapp/tests/test_views.py	2011-03-24 19:56:36 +0000
@@ -1,3 +1,4 @@
+#
 #   This file is part of Software Center Ratings and Reviews
 #   Copyright (C) 2010 Canonical Ltd.
 #
@@ -190,6 +191,21 @@
             '<a href="https://launchpad.net/~{0}">{1}</a>'.format(
                 reviewer.username, reviewer.get_full_name()))
 
+    def test_non_ascii_reviewer(self):
+        moderation = self.factory.makeReviewModeration(language='en')
+        reviewer = moderation.review.reviewer
+        reviewer.username = u'\xa1'
+        reviewer.first_name = u'\xa2'
+        reviewer.last_name = u'\xa3'
+        reviewer.save()
+
+        response = self._request_url_as_moderator()
+
+        self.assertContains(response,
+            u'<a href="https://launchpad.net/~{0}">{1}</a>'.format(
+                reviewer.username, reviewer.get_full_name()))
+
+
     def test_includes_next_url_with_get_params(self):
         # The next_url inludes current filtering options.
         response = self._request_url_as_moderator(data=dict(language='en'))