Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[py3] Replaced some __str__ methods by __unicode__

These methods actually return unicode.
  • Loading branch information...
commit e7e08fd48b3f88d4eb481f5b213b923fc1db3675 1 parent 2bb2eec
@aaugustin aaugustin authored
View
2  django/core/files/base.py
@@ -130,7 +130,7 @@ def __init__(self, content, name=None):
super(ContentFile, self).__init__(BytesIO(content), name=name)
self.size = len(content)
- def __str__(self):
+ def __unicode__(self):
return 'Raw content'
def __bool__(self):
View
8 django/db/models/options.py
@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
import re
from bisect import bisect
@@ -8,7 +10,7 @@
from django.db.models.fields.proxy import OrderWrt
from django.db.models.loading import get_models, app_cache_ready
from django.utils.translation import activate, deactivate_all, get_language, string_concat
-from django.utils.encoding import force_text, smart_bytes
+from django.utils.encoding import force_text, smart_text
from django.utils.datastructures import SortedDict
from django.utils import six
@@ -198,8 +200,8 @@ def setup_proxy(self, target):
def __repr__(self):
return '<Options for %s>' % self.object_name
- def __str__(self):
- return "%s.%s" % (smart_bytes(self.app_label), smart_bytes(self.module_name))
+ def __unicode__(self):
+ return "%s.%s" % (smart_text(self.app_label), smart_text(self.module_name))
def verbose_name_raw(self):
"""
View
4 tests/modeltests/delete/models.py
@@ -1,10 +1,12 @@
+from __future__ import unicode_literals
+
from django.db import models
class R(models.Model):
is_default = models.BooleanField(default=False)
- def __str__(self):
+ def __unicode__(self):
return "%s" % self.pk
View
8 tests/regressiontests/comment_tests/models.py
@@ -3,6 +3,8 @@
more information.
"""
+from __future__ import unicode_literals
+
from django.db import models
@@ -10,14 +12,14 @@ class Author(models.Model):
first_name = models.CharField(max_length=30)
last_name = models.CharField(max_length=30)
- def __str__(self):
+ def __unicode__(self):
return '%s %s' % (self.first_name, self.last_name)
class Article(models.Model):
author = models.ForeignKey(Author)
headline = models.CharField(max_length=100)
- def __str__(self):
+ def __unicode__(self):
return self.headline
class Entry(models.Model):
@@ -26,7 +28,7 @@ class Entry(models.Model):
pub_date = models.DateField()
enable_comments = models.BooleanField()
- def __str__(self):
+ def __unicode__(self):
return self.title
class Book(models.Model):
View
2  tests/regressiontests/datatypes/models.py
@@ -18,7 +18,7 @@ class Donut(models.Model):
class Meta:
ordering = ('consumed_at',)
- def __str__(self):
+ def __unicode__(self):
return self.name
class RumBaba(models.Model):
View
4 tests/regressiontests/string_lookup/models.py
@@ -1,4 +1,6 @@
# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
from django.db import models
@@ -42,5 +44,5 @@ class Article(models.Model):
text = models.TextField()
submitted_from = models.IPAddressField(blank=True, null=True)
- def __str__(self):
+ def __unicode__(self):
return "Article %s" % self.name
Please sign in to comment.
Something went wrong with that request. Please try again.