summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--django/db/models/fields/files.py7
-rw-r--r--tests/model_forms/models.py8
-rw-r--r--tests/model_forms/tests.py2
3 files changed, 0 insertions, 17 deletions
diff --git a/django/db/models/fields/files.py b/django/db/models/fields/files.py
index 95249dee53..f2a1ff01b1 100644
--- a/django/db/models/fields/files.py
+++ b/django/db/models/fields/files.py
@@ -322,13 +322,6 @@ class FileField(Field):
def formfield(self, **kwargs):
defaults = {'form_class': forms.FileField, 'max_length': self.max_length}
- # If a file has been provided previously, then the form doesn't require
- # that a new file is provided this time.
- # The code to mark the form field as not required is used by
- # form_for_instance, but can probably be removed once form_for_instance
- # is gone. ModelForm uses a different method to check for an existing file.
- if 'initial' in kwargs:
- defaults['required'] = False
defaults.update(kwargs)
return super().formfield(**defaults)
diff --git a/tests/model_forms/models.py b/tests/model_forms/models.py
index cf5ca49cf6..6e08eaec71 100644
--- a/tests/model_forms/models.py
+++ b/tests/model_forms/models.py
@@ -1,11 +1,3 @@
-"""
-XX. Generating HTML forms from models
-
-This is mostly just a reworking of the ``form_for_model``/``form_for_instance``
-tests to use ``ModelForm``. As such, the text may not make sense in all cases,
-and the examples are probably a poor fit for the ``ModelForm`` syntax. In other
-words, most of these tests should be rewritten.
-"""
import datetime
import os
import tempfile
diff --git a/tests/model_forms/tests.py b/tests/model_forms/tests.py
index afe94890c3..b92ba1fa4a 100644
--- a/tests/model_forms/tests.py
+++ b/tests/model_forms/tests.py
@@ -1363,8 +1363,6 @@ class ModelFormBasicTests(TestCase):
'''<tr><th>Headline:</th><td><input type="text" name="headline" maxlength="50" required /></td></tr>
<tr><th>Pub date:</th><td><input type="text" name="pub_date" required /></td></tr>''')
- # You can create a form over a subset of the available fields
- # by specifying a 'fields' argument to form_for_instance.
class PartialArticleFormWithSlug(forms.ModelForm):
class Meta:
model = Article