Merge pull request #127 from kporangehat/unicode_fixes

fix errors caused by user names with unicode data

2 files changed, 9 insertions, 3 deletions

diff --git a/askbot/models/question.py b/askbot/models/question.py
index 8a00a3c3..3dd9fc6b 100644
--- a/askbot/models/question.py
+++ b/askbot/models/question.py
@@ -1449,8 +1449,12 @@ class FavoriteQuestion(models.Model):
     class Meta:
         app_label = 'askbot'
         db_table = u'favorite_question'
+
+    def __str__(self):
+        return unicode(self).encode('utf-8')
+
     def __unicode__(self):
-        return '[%s] favorited at %s' %(self.user, self.added_at)
+        return u'[%s] favorited at %s' %(self.user, self.added_at)
 
 
 class DraftQuestion(models.Model):
diff --git a/askbot/models/user.py b/askbot/models/user.py
index cff24b18..af70b8be 100644
--- a/askbot/models/user.py
+++ b/askbot/models/user.py
@@ -311,13 +311,15 @@ class EmailFeedSetting(models.Model):
         unique_together = ('subscriber', 'feed_type')
         app_label = 'askbot'
 
-
     def __str__(self):
+        return unicode(self).encode('utf-8')
+
+    def __unicode__(self):
         if self.reported_at is None:
             reported_at = "'not yet'"
         else:
             reported_at = '%s' % self.reported_at.strftime('%d/%m/%y %H:%M')
-        return 'Email feed for %s type=%s, frequency=%s, reported_at=%s' % (
+        return u'Email feed for %s type=%s, frequency=%s, reported_at=%s' % (
                                                      self.subscriber,
                                                      self.feed_type,
                                                      self.frequency,