innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #28264 -- Made FilePathField sort files and directories when recursive=True.

This commit is contained in:
Srinivas Reddy Thatiparthy 2017-07-16 11:30:03 +05:30 committed by Tim Graham
parent 99e7bba443
commit b306c0c1a3
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/forms/fields.py
View File

@ -1083,12 +1083,12 @@ class FilePathField(ChoiceField):
if recursive: if recursive:
for root, dirs, files in sorted(os.walk(self.path)): for root, dirs, files in sorted(os.walk(self.path)):
if self.allow_files: if self.allow_files:
for f in files: for f in sorted(files):
if self.match is None or self.match_re.search(f): if self.match is None or self.match_re.search(f):
f = os.path.join(root, f) f = os.path.join(root, f)
self.choices.append((f, f.replace(path, "", 1))) self.choices.append((f, f.replace(path, "", 1)))
if self.allow_folders: if self.allow_folders:
for f in dirs: for f in sorted(dirs):
if f == '__pycache__': if f == '__pycache__':
continue continue
if self.match is None or self.match_re.search(f): if self.match is None or self.match_re.search(f):

0
tests/forms_tests/field_tests/filepathfield_test_dir/h/__init__.py Normal file
View File

0
tests/forms_tests/field_tests/filepathfield_test_dir/j/__init__.py Normal file
View File

14
tests/forms_tests/field_tests/test_filepathfield.py
View File

@ -30,6 +30,8 @@ class FilePathFieldTest(SimpleTestCase):
('/filepathfield_test_dir/c/e.py', 'e.py'), ('/filepathfield_test_dir/c/e.py', 'e.py'),
('/filepathfield_test_dir/c/f/__init__.py', '__init__.py'), ('/filepathfield_test_dir/c/f/__init__.py', '__init__.py'),
('/filepathfield_test_dir/c/f/g.py', 'g.py'), ('/filepathfield_test_dir/c/f/g.py', 'g.py'),
('/filepathfield_test_dir/h/__init__.py', '__init__.py'),
('/filepathfield_test_dir/j/__init__.py', '__init__.py'),
] ]
path = os.path.join(PATH, 'filepathfield_test_dir') + '/' path = os.path.join(PATH, 'filepathfield_test_dir') + '/'
@ -59,7 +61,6 @@ class FilePathFieldTest(SimpleTestCase):
def test_recursive(self): def test_recursive(self):
f = FilePathField(path=self.path, recursive=True, match=r'^.*?\.py$') f = FilePathField(path=self.path, recursive=True, match=r'^.*?\.py$')
f.choices.sort()
expected = [ expected = [
('/filepathfield_test_dir/__init__.py', '__init__.py'), ('/filepathfield_test_dir/__init__.py', '__init__.py'),
('/filepathfield_test_dir/a.py', 'a.py'), ('/filepathfield_test_dir/a.py', 'a.py'),
@ -70,14 +71,19 @@ class FilePathFieldTest(SimpleTestCase):
('/filepathfield_test_dir/c/e.py', 'c/e.py'), ('/filepathfield_test_dir/c/e.py', 'c/e.py'),
('/filepathfield_test_dir/c/f/__init__.py', 'c/f/__init__.py'), ('/filepathfield_test_dir/c/f/__init__.py', 'c/f/__init__.py'),
('/filepathfield_test_dir/c/f/g.py', 'c/f/g.py'), ('/filepathfield_test_dir/c/f/g.py', 'c/f/g.py'),
('/filepathfield_test_dir/h/__init__.py', 'h/__init__.py'),
('/filepathfield_test_dir/j/__init__.py', 'j/__init__.py'),
] ]
self.assertChoices(f, expected) self.assertChoices(f, expected)
def test_allow_folders(self): def test_allow_folders(self):
f = FilePathField(path=self.path, allow_folders=True, allow_files=False) f = FilePathField(path=self.path, allow_folders=True, allow_files=False)
self.assertChoices(f, [ self.assertChoices(f, [
('/filepathfield_test_dir/c', 'c')], ('/filepathfield_test_dir/c', 'c'),
) ('/filepathfield_test_dir/h', 'h'),
('/filepathfield_test_dir/j', 'j'),
])
def test_recursive_no_folders_or_files(self): def test_recursive_no_folders_or_files(self):
f = FilePathField(path=self.path, recursive=True, allow_folders=False, allow_files=False) f = FilePathField(path=self.path, recursive=True, allow_folders=False, allow_files=False)
@ -87,5 +93,7 @@ class FilePathFieldTest(SimpleTestCase):
f = FilePathField(path=self.path, recursive=True, allow_folders=True, allow_files=False) f = FilePathField(path=self.path, recursive=True, allow_folders=True, allow_files=False)
self.assertChoices(f, [ self.assertChoices(f, [
('/filepathfield_test_dir/c', 'c'), ('/filepathfield_test_dir/c', 'c'),
('/filepathfield_test_dir/h', 'h'),
('/filepathfield_test_dir/j', 'j'),
('/filepathfield_test_dir/c/f', 'c/f'), ('/filepathfield_test_dir/c/f', 'c/f'),
]) ])