Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[1.2.X] Fixed #8217 -- Correctly sort files in FilePathFields on olde…

…r Python versions. Thanks, bernd and davidb.

Backport from trunk (r14772).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14774 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit d7391648d4035dbce70f11f131cf90587d122560 1 parent a607d9d
@jezdez jezdez authored
Showing with 2 additions and 2 deletions.
  1. +2 −2 django/forms/fields.py
View
4 django/forms/fields.py
@@ -832,14 +832,14 @@ def __init__(self, path, match=None, recursive=False, required=True,
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))
Please sign in to comment.
Something went wrong with that request. Please try again.