X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/ba4bab73996c40c2551f7e5a0e478d0f553b8af3..7beaf5e7ce33721111cf455028dc872ff8a5512a:/models/base.py?ds=inline diff --git a/models/base.py b/models/base.py index 8370bb7..836fe4a 100644 --- a/models/base.py +++ b/models/base.py @@ -5,7 +5,7 @@ from django.contrib.contenttypes import generic from django.core.exceptions import ObjectDoesNotExist from django.core.validators import RegexValidator from django.utils import simplejson as json -from django.utils.encoding import smart_str +from django.utils.encoding import force_unicode from philo.exceptions import AncestorDoesNotExist from philo.models.fields import JSONField from philo.utils import ContentTypeRegistryLimiter, ContentTypeSubclassLimiter @@ -84,7 +84,7 @@ class JSONValue(AttributeValue): value = JSONField(verbose_name='Value (JSON)', help_text='This value must be valid JSON.', default='null', db_index=True) def __unicode__(self): - return smart_str(self.value) + return force_unicode(self.value) def value_formfields(self): kwargs = {'initial': self.value_json}