summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2012-08-29 09:45:02 +0200
committerClaude Paroz <claude@2xlibre.net>2012-08-29 11:21:33 +0200
commit361d6738f89f8443855d4378d3241566d9fca6e9 (patch)
tree195b9a820d5d350e27b72a44b3efe72a6d3abf93 /docs
parentebc773ada3e4f40cf5084268387b873d7fe22e8b (diff)
Fixed #11739 -- Made ContentFile support Unicode input
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/files/file.txt12
1 files changed, 8 insertions, 4 deletions
diff --git a/docs/ref/files/file.txt b/docs/ref/files/file.txt
index 99547f1c9e..ada614df45 100644
--- a/docs/ref/files/file.txt
+++ b/docs/ref/files/file.txt
@@ -91,14 +91,18 @@ The ``ContentFile`` Class
.. class:: ContentFile(File)
The ``ContentFile`` class inherits from :class:`~django.core.files.File`,
- but unlike :class:`~django.core.files.File` it operates on string content,
- rather than an actual file. For example::
+ but unlike :class:`~django.core.files.File` it operates on string content
+ (bytes also supported), rather than an actual file. For example::
from __future__ import unicode_literals
from django.core.files.base import ContentFile
- f1 = ContentFile(b"my string content")
- f2 = ContentFile("my unicode content encoded as UTF-8".encode('UTF-8'))
+ f1 = ContentFile("esta sentencia está en español")
+ f2 = ContentFile(b"these are bytes")
+
+ .. versionchanged:: 1.5
+
+ ContentFile also accepts Unicode strings.
.. currentmodule:: django.core.files.images