diff options
| -rw-r--r-- | django/forms/fields.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/django/forms/fields.py b/django/forms/fields.py index 16c9218549..a0b559319b 100644 --- a/django/forms/fields.py +++ b/django/forms/fields.py @@ -867,14 +867,14 @@ class FilePathField(ChoiceField): self.match_re = re.compile(self.match) if recursive: - for root, dirs, files in os.walk(self.path): + for root, dirs, files in sorted(os.walk(self.path)): for f in files: if self.match is None or self.match_re.search(f): f = os.path.join(root, f) self.choices.append((f, f.replace(path, "", 1))) else: try: - for f in os.listdir(self.path): + for f in sorted(os.listdir(self.path)): full_file = os.path.join(self.path, f) if os.path.isfile(full_file) and (self.match is None or self.match_re.search(f)): self.choices.append((full_file, f)) |