mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-11-07 07:15:35 +00:00
Code Issues 32 Releases Wiki Activity

[py3] Refactored __unicode__ to __str__.

Browse Source 
* Renamed the __unicode__ methods
* Applied the python_2_unicode_compatible decorator
* Removed the StrAndUnicode mix-in that is superseded by
  python_2_unicode_compatible
* Kept the __unicode__ methods in classes that specifically
  test it under Python 2
This commit is contained in:
Aymeric Augustin
2012-08-12 12:32:08 +02:00
parent 79d62a7175
commit d4a0b27838
142 changed files with 1072 additions and 481 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
django/core/files/base.py
View File

@@ -5,7 +5,9 @@ from io import BytesIO
from django.utils.encoding import smart_bytes, smart_text
from django.core.files.utils import FileProxyMixin
from django.utils.encoding import python_2_unicode_compatible
@python_2_unicode_compatible
class File(FileProxyMixin):
DEFAULT_CHUNK_SIZE = 64 * 2**10
@@ -17,7 +19,7 @@ class File(FileProxyMixin):
if hasattr(file, 'mode'):
self.mode = file.mode
def __unicode__(self):
def __str__(self):
return smart_text(self.name or '')
def __repr__(self):
@@ -121,6 +123,7 @@ class File(FileProxyMixin):
def close(self):
self.file.close()
@python_2_unicode_compatible
class ContentFile(File):
"""
A File-like object that takes just raw content, rather than an actual file.
@@ -130,7 +133,7 @@ class ContentFile(File):
super(ContentFile, self).__init__(BytesIO(content), name=name)
self.size = len(content)
def __unicode__(self):
def __str__(self):
return 'Raw content'
def __bool__(self):

4
django/core/files/uploadhandler.py
View File

@@ -10,6 +10,7 @@ from django.conf import settings
from django.core.exceptions import ImproperlyConfigured
from django.core.files.uploadedfile import TemporaryUploadedFile, InMemoryUploadedFile
from django.utils import importlib
from django.utils.encoding import python_2_unicode_compatible
__all__ = ['UploadFileException','StopUpload', 'SkipFile', 'FileUploadHandler',
'TemporaryFileUploadHandler', 'MemoryFileUploadHandler',
@@ -21,6 +22,7 @@ class UploadFileException(Exception):
"""
pass
@python_2_unicode_compatible
class StopUpload(UploadFileException):
"""
This exception is raised when an upload must abort.
@@ -33,7 +35,7 @@ class StopUpload(UploadFileException):
"""
self.connection_reset = connection_reset
def __unicode__(self):
def __str__(self):
if self.connection_reset:
return 'StopUpload: Halt current upload.'
else: