Unverified Commit d70cba1e authored by Diederik van der Boor's avatar Diederik van der Boor Committed by GitHub
Browse files

Merge pull request #9 from shtalinberg/master

fix UnicodeDecodeError with cyrillic file names
parents 8f26e231 03eca312
...@@ -9,7 +9,6 @@ from django.core.exceptions import ValidationError ...@@ -9,7 +9,6 @@ from django.core.exceptions import ValidationError
from django.core.files.uploadedfile import UploadedFile from django.core.files.uploadedfile import UploadedFile
from django.db import models from django.db import models
from django.template.defaultfilters import filesizeformat from django.template.defaultfilters import filesizeformat
from django.utils.encoding import smart_str
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from .storage import private_storage from .storage import private_storage
...@@ -71,4 +70,4 @@ class PrivateFileField(models.FileField): ...@@ -71,4 +70,4 @@ class PrivateFileField(models.FileField):
if not subdirs: if not subdirs:
subdirs = [self.get_directory_name()] subdirs = [self.get_directory_name()]
dirs = list(subdirs) + [self.get_filename(filename)] dirs = list(subdirs) + [self.get_filename(filename)]
return smart_str(os.path.join(*dirs)) return os.path.normpath(os.path.join(*dirs))
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment