[py3] Replaced some __str__ methods by __unicode__ (e7e08fd4) · Commits · Dom Sekotill / django

django/core/files/base.py

+1 −1

Original line number	Diff line number	Diff line
		@@ -130,7 +130,7 @@ class ContentFile(File):
		super(ContentFile, self).__init__(BytesIO(content), name=name)
		self.size = len(content)

		def __str__(self):
		def __unicode__(self):
		return 'Raw content'

		def __bool__(self):

+5 −3

Original line number	Diff line number	Diff line
		from __future__ import unicode_literals

		import re
		from bisect import bisect

		@@ -8,7 +10,7 @@ from django.db.models.fields import AutoField, FieldDoesNotExist
		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 @@ class Options(object):
		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):
		"""

+3 −1

Original line number	Diff line number	Diff line
		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

+5 −3

Original line number	Diff line number	Diff line
		@@ -3,6 +3,8 @@ Comments may be attached to any object. See the comment documentation for
		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):

+1 −1