diff --git a/admin_interface/models.py b/admin_interface/models.py index 40fbe11..c9e7fc1 100644 --- a/admin_interface/models.py +++ b/admin_interface/models.py @@ -1,14 +1,17 @@ # -*- coding: utf-8 -*- +from __future__ import unicode_literals from django.core.files import File from django.db import models from django.db.models.signals import post_delete, post_save +from django.utils.encoding import python_2_unicode_compatible, force_text from colorfield.fields import ColorField import os +@python_2_unicode_compatible class Theme(models.Model): @staticmethod @@ -134,9 +137,8 @@ class Theme(models.Model): verbose_name = 'Theme' verbose_name_plural = 'Themes' - def __unicode__(self): - - return unicode(u'%s' % (self.name, )) + def __str__(self): + return force_text(self.name) post_delete.connect(Theme.post_delete_handler, sender = Theme) diff --git a/tests/tests.py b/tests/tests.py index 4cb0ebe..11e538f 100644 --- a/tests/tests.py +++ b/tests/tests.py @@ -116,3 +116,7 @@ class AdminInterfaceTestCase(TestCase): rendered = self.__render_template('{% load admin_interface_tags %}{% get_admin_interface_theme as theme %}{{ theme.name }}') self.assertEqual(rendered, 'Django') + def test_repr(self): + theme = Theme.get_active_theme() + self.assertEqual( "{0}".format(theme), 'Django' ) +