summaryrefslogtreecommitdiff
path: root/django/forms
diff options
context:
space:
mode:
Diffstat (limited to 'django/forms')
-rw-r--r--django/forms/__init__.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/django/forms/__init__.py b/django/forms/__init__.py
index a730291b45..fab7a6da7a 100644
--- a/django/forms/__init__.py
+++ b/django/forms/__init__.py
@@ -898,10 +898,11 @@ class FilePathField(SelectField):
"A SelectField whose choices are the files in a given directory."
def __init__(self, field_name, path, match=None, recursive=False, is_required=False, validator_list=None):
import os
+ from django.db.models import BLANK_CHOICE_DASH
if match is not None:
import re
match_re = re.compile(match)
- choices = []
+ choices = not is_required and BLANK_CHOICE_DASH[:] or []
if recursive:
for root, dirs, files in os.walk(path):
for f in files: