Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

magic-removal: Fixed #1536 -- FilePathField with recursive=True no lo…

…nger loses subdirectory. Thanks, Andy Dustman

git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2731 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit c551eac5e4ad99fb864f3e1efcb84cf456b812f6 1 parent 45be99d
@adrianholovaty adrianholovaty authored
Showing with 1 addition and 1 deletion.
  1. +1 −1  django/forms/__init__.py
View
2  django/forms/__init__.py
@@ -879,7 +879,7 @@ def __init__(self, field_name, path, match=None, recursive=False, is_required=Fa
for root, dirs, files in os.walk(path):
for f in files:
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:
try:
for f in os.listdir(path):
Please sign in to comment.
Something went wrong with that request. Please try again.