summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvgeny Fadeev <evgeny.fadeev@gmail.com>2014-09-18 17:05:15 +0700
committerEvgeny Fadeev <evgeny.fadeev@gmail.com>2014-09-18 17:05:15 +0700
commit178f4e1a95c038ccfe4cb821c5ca2acca4c6b4ae (patch)
tree2af294539a7c8287d69ceb1435cb3ddbb708579f
parent1de7775ecb9d1a6f6d8ddb4452d33ff5fc319f6e (diff)
parenta40d27a61e1b6c90a1b247ac75dddfc81ca09b04 (diff)
downloadaskbot-178f4e1a95c038ccfe4cb821c5ca2acca4c6b4ae.tar.gz
askbot-178f4e1a95c038ccfe4cb821c5ca2acca4c6b4ae.tar.bz2
askbot-178f4e1a95c038ccfe4cb821c5ca2acca4c6b4ae.zip
Merge pull request #309 from keto/unicode-fixes
Make sure __unicode__ methods return unicode
-rw-r--r--askbot/deps/django_authopenid/models.py2
-rw-r--r--askbot/models/repute.py2
-rw-r--r--askbot/models/widgets.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/askbot/deps/django_authopenid/models.py b/askbot/deps/django_authopenid/models.py
index bc0e6ac4..b931f1e4 100644
--- a/askbot/deps/django_authopenid/models.py
+++ b/askbot/deps/django_authopenid/models.py
@@ -58,7 +58,7 @@ class UserAssociation(models.Model):
)
def __unicode__(self):
- return "Openid %s with user %s" % (self.openid_url, self.user)
+ return u"Openid %s with user %s" % (self.openid_url, self.user)
class UserPasswordQueueManager(models.Manager):
""" manager for UserPasswordQueue object """
diff --git a/askbot/models/repute.py b/askbot/models/repute.py
index 515356f0..f2996aa7 100644
--- a/askbot/models/repute.py
+++ b/askbot/models/repute.py
@@ -50,7 +50,7 @@ class Vote(models.Model):
db_table = u'vote'
def __unicode__(self):
- return '[%s] voted at %s: %s' %(self.user, self.voted_at, self.vote)
+ return u'[%s] voted at %s: %s' %(self.user, self.voted_at, self.vote)
def __int__(self):
"""1 if upvote -1 if downvote"""
diff --git a/askbot/models/widgets.py b/askbot/models/widgets.py
index bdec5eb2..8d31a3ee 100644
--- a/askbot/models/widgets.py
+++ b/askbot/models/widgets.py
@@ -18,7 +18,7 @@ class AskWidget(models.Model):
app_label = 'askbot'
def __unicode__(self):
- return "Widget: %s" % self.title
+ return u"Widget: %s" % self.title
class QuestionWidget(models.Model):