From c551eac5e4ad99fb864f3e1efcb84cf456b812f6 Mon Sep 17 00:00:00 2001 From: Adrian Holovaty Date: Sun, 23 Apr 2006 21:30:04 +0000 Subject: [PATCH] magic-removal: Fixed #1536 -- FilePathField with recursive=True no longer loses subdirectory. Thanks, Andy Dustman git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2731 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/forms/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/django/forms/__init__.py b/django/forms/__init__.py index ba42706c9e..b54351fd80 100644 --- a/django/forms/__init__.py +++ b/django/forms/__init__.py @@ -879,7 +879,7 @@ class FilePathField(SelectField): 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):