Browse Source

Refs #23919 -- Removed File's Python 2 proxied methods.

Josh Schneier 8 years ago
parent
commit
9b538badb1
2 changed files with 3 additions and 5 deletions
  1. 0 2
      django/core/files/utils.py
  2. 3 3
      docs/ref/files/file.txt

+ 0 - 2
django/core/files/utils.py

@@ -18,12 +18,10 @@ class FileProxyMixin:
     readline = property(lambda self: self.file.readline)
     readlines = property(lambda self: self.file.readlines)
     seek = property(lambda self: self.file.seek)
-    softspace = property(lambda self: self.file.softspace)
     tell = property(lambda self: self.file.tell)
     truncate = property(lambda self: self.file.truncate)
     write = property(lambda self: self.file.write)
     writelines = property(lambda self: self.file.writelines)
-    xreadlines = property(lambda self: self.file.xreadlines)
 
     @property
     def closed(self):

+ 3 - 3
docs/ref/files/file.txt

@@ -83,9 +83,9 @@ The ``File`` class
     In addition to the listed methods, :class:`~django.core.files.File` exposes
     the following attributes and methods of its ``file`` object:
     ``encoding``, ``fileno``, ``flush``, ``isatty``, ``newlines``, ``read``,
-    ``readinto``, ``readline``, ``readlines``, ``seek``, ``softspace``,
-    ``tell``, ``truncate``, ``write``, ``writelines``, ``xreadlines``,
-    ``readable()``, ``writable()``, and ``seekable()``.
+    ``readinto``, ``readline``, ``readlines``, ``seek``, ``tell``,
+    ``truncate``, ``write``, ``writelines``, ``readable()``, ``writable()``,
+    and ``seekable()``.
 
     .. versionchanged:: 1.11