diff options
| author | Raphaël Barrois <raphael.barrois@polytechnique.org> | 2016-02-10 00:15:52 +0100 |
|---|---|---|
| committer | Raphaël Barrois <raphael.barrois@polytechnique.org> | 2016-02-10 00:16:58 +0100 |
| commit | efd5c65b99a31992001a9581a41ec4627c4d94fa (patch) | |
| tree | 7d4d5aae5a7df094b73691370cefb0fdc187b415 /docs | |
| parent | 8269885f9a71850838ee003627bcfd6d6d53e2ee (diff) | |
| download | factory-boy-efd5c65b99a31992001a9581a41ec4627c4d94fa.tar factory-boy-efd5c65b99a31992001a9581a41ec4627c4d94fa.tar.gz | |
Clarify precedence on factory.django.FileField (Closes #257).
When both ``from_file`` and ``filename`` are provided, ``filename``
takes precedence.
Thanks to @darkowic for spotting this :)
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/orms.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/orms.rst b/docs/orms.rst index bd481bd..d1b30fc 100644 --- a/docs/orms.rst +++ b/docs/orms.rst @@ -126,7 +126,7 @@ Extra fields :param str from_path: Use data from the file located at ``from_path``, and keep its filename :param file from_file: Use the contents of the provided file object; use its filename - if available + if available, unless ``filename`` is also provided. :param bytes data: Use the provided bytes as file contents :param str filename: The filename for the FileField |