Fixed #8422: FilePathField now respects required=False.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10447 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 8 insertions, 1 deletions

diff --git a/django/forms/fields.py b/django/forms/fields.py
index 9c4084450a..bd4f3d4a80 100644
--- a/django/forms/fields.py
+++ b/django/forms/fields.py
@@ -829,9 +829,15 @@ class FilePathField(ChoiceField):
         super(FilePathField, self).__init__(choices=(), required=required,
             widget=widget, label=label, initial=initial, help_text=help_text,
             *args, **kwargs)
-        self.choices = []
+            
+        if self.required:
+            self.choices = []
+        else:
+            self.choices = [("", "---------")]
+
         if self.match is not None:
             self.match_re = re.compile(self.match)
+
         if recursive:
             for root, dirs, files in os.walk(self.path):
                 for f in files:
@@ -846,6 +852,7 @@ class FilePathField(ChoiceField):
                         self.choices.append((full_file, f))
             except OSError:
                 pass
+
         self.widget.choices = self.choices
 
 class SplitDateTimeField(MultiValueField):