summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorSimon Charette <charette.s@gmail.com>2016-05-22 12:43:56 -0400
committerSimon Charette <charette.s@gmail.com>2016-05-27 21:05:58 -0400
commit4f474607de9b470f977a734bdd47590ab202e778 (patch)
treece05cd13e229c7086362703d84c9dedd8a0d6fb2 /docs
parent6ab0d1358fc78077064aab88a4fb0a47ca116391 (diff)
Fixed #26646 -- Added IOBase methods required by TextIOWrapper to File.
Thanks Tim for the review.
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/files/file.txt9
-rw-r--r--docs/releases/1.11.txt4
-rw-r--r--docs/spelling_wordlist1
3 files changed, 11 insertions, 3 deletions
diff --git a/docs/ref/files/file.txt b/docs/ref/files/file.txt
index e88032ab66..6c218e38b3 100644
--- a/docs/ref/files/file.txt
+++ b/docs/ref/files/file.txt
@@ -92,8 +92,13 @@ The ``File`` class
the following attributes and methods of its ``file`` object:
``encoding``, ``fileno``, ``flush``, ``isatty``, ``newlines``,
``read``, ``readinto``, ``readlines``, ``seek``, ``softspace``, ``tell``,
- ``truncate``, ``writelines``, ``xreadlines``. If you are using
- Python 3, the ``seekable`` method is also available.
+ ``truncate``, ``writelines``, ``xreadlines``, ``readable()``,
+ ``writable()``, and ``seekable()``.
+
+ .. versionchanged:: 1.11
+
+ The ``readable()`` and ``writable()`` methods were added and the
+ ``seekable()`` method was made available on Python 2.
.. currentmodule:: django.core.files.base
diff --git a/docs/releases/1.11.txt b/docs/releases/1.11.txt
index e2583a4dc4..6a1f1e0241 100644
--- a/docs/releases/1.11.txt
+++ b/docs/releases/1.11.txt
@@ -122,7 +122,9 @@ Email
File Storage
~~~~~~~~~~~~
-* ...
+* To make it wrappable by :class:`io.TextIOWrapper`,
+ :class:`~django.core.files.File` now has the ``readable()``, ``writable()``,
+ and ``seekable()`` methods.
File Uploads
~~~~~~~~~~~~
diff --git a/docs/spelling_wordlist b/docs/spelling_wordlist
index c9fb05f5ea..4355bbd065 100644
--- a/docs/spelling_wordlist
+++ b/docs/spelling_wordlist
@@ -972,6 +972,7 @@ wordcount
wordwrap
workflow
worksforme
+wrappable
wsgi
www
xe