Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #11030: fixed file uploads on non-utf8 filesystem encoding. Tha…

…nks, Honza Kral.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10693 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit a59095af24bb64a025ce99de3555f2a21da7a2e8 1 parent fb9ac57
@jacobian jacobian authored
View
4 django/core/files/storage.py
@@ -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.importlib import import_module
from django.utils.text import get_valid_filename
@@ -212,7 +212,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))
View
4 tests/modeltests/files/models.py
@@ -70,13 +70,13 @@ def random_upload_to(self, filename):
[]
>>> files.sort()
>>> files
-[u'default.txt', u'django_test.txt']
+['default.txt', 'django_test.txt']
>>> obj1.save()
>>> dirs, files = temp_storage.listdir('tests')
>>> files.sort()
>>> files
-[u'assignment.txt', u'default.txt', u'django_test.txt']
+['assignment.txt', 'default.txt', 'django_test.txt']
# Files can be read in a little at a time, if necessary.
Please sign in to comment.
Something went wrong with that request. Please try again.