Browse files

[1.0.X] Fixed #11030: fixed file uploads on non-utf8 filesystem encod…

…ing. Thanks, Honza Kral. Backport of [10693] from trunk.

git-svn-id: bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent b03e58b commit 09c2559b4193992f6ba29f033052b81c87f4f2f0 @jacobian jacobian committed May 7, 2009
Showing with 2 additions and 2 deletions.
  1. +2 −2 django/core/files/
@@ -6,7 +6,7 @@
from django.core.exceptions import ImproperlyConfigured, SuspiciousOperation
from django.core.files import locks, File
from django.core.files.move import file_move_safe
-from django.utils.encoding import force_unicode
+from django.utils.encoding import force_unicode, smart_str
from django.utils.functional import LazyObject
from django.utils.text import get_valid_filename
from django.utils._os import safe_join
@@ -211,7 +211,7 @@ def path(self, name):
path = safe_join(self.location, name)
except ValueError:
raise SuspiciousOperation("Attempted access to '%s' denied." % name)
- return os.path.normpath(path)
+ return smart_str(os.path.normpath(path))
def size(self, name):
return os.path.getsize(self.path(name))

0 comments on commit 09c2559

Please sign in to comment.