diff options
Diffstat (limited to 'docs/ref/files')
| -rw-r--r-- | docs/ref/files/file.txt | 2 | ||||
| -rw-r--r-- | docs/ref/files/storage.txt | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/ref/files/file.txt b/docs/ref/files/file.txt index d0b0cdd786..23a3814f5d 100644 --- a/docs/ref/files/file.txt +++ b/docs/ref/files/file.txt @@ -50,7 +50,7 @@ The ``File`` class Open or reopen the file (which also does ``File.seek(0)``). The ``mode`` argument allows the same values - as Python's built-in :func:`python:open()`. ``*args`` and ``**kwargs`` + as Python's built-in :func:`python:open`. ``*args`` and ``**kwargs`` are passed after ``mode`` to Python's built-in :func:`python:open`. When reopening a file, ``mode`` will override whatever mode the file diff --git a/docs/ref/files/storage.txt b/docs/ref/files/storage.txt index 228025fe3a..85a1e3b926 100644 --- a/docs/ref/files/storage.txt +++ b/docs/ref/files/storage.txt @@ -201,12 +201,12 @@ The ``Storage`` class .. method:: generate_filename(filename) - Validates the ``filename`` by calling :attr:`get_valid_name()` and + Validates the ``filename`` by calling :attr:`get_valid_name` and returns a filename to be passed to the :meth:`save` method. The ``filename`` argument may include a path as returned by :attr:`FileField.upload_to <django.db.models.FileField.upload_to>`. - In that case, the path won't be passed to :attr:`get_valid_name()` but + In that case, the path won't be passed to :attr:`get_valid_name` but will be prepended back to the resulting name. The default implementation uses :mod:`os.path` operations. Override |