mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-04 09:49:12 +00:00
Code Issues 32 Releases Wiki Activity

magic-removal: Fixed #1536 -- FilePathField with recursive=True no longer loses subdirectory. Thanks, Andy Dustman

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2731 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2006-04-23 21:30:04 +00:00
parent 45be99d486
commit c551eac5e4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/forms/__init__.py
View File

@ -879,7 +879,7 @@ class FilePathField(SelectField):
for root, dirs, files in os.walk(path): for root, dirs, files in os.walk(path):
for f in files: for f in files:
if match is None or match_re.search(f): if match is None or match_re.search(f):
choices.append((os.path.join(path, f), f)) choices.append((os.path.join(root, f), f))
else: else:
try: try:
for f in os.listdir(path): for f in os.listdir(path):