test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[py3] Fed strftime with unicode on Python 3

This commit is contained in:
Claude Paroz 2012-08-14 16:19:58 +02:00
parent c35501a128
commit 9cb80356fc
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/db/models/fields/files.py
View File

@ -8,7 +8,7 @@ from django.core.files.base import File
from django.core.files.storage import default_storage from django.core.files.storage import default_storage
from django.core.files.images import ImageFile from django.core.files.images import ImageFile
from django.db.models import signals from django.db.models import signals
from django.utils.encoding import force_text, smart_bytes from django.utils.encoding import force_text, smart_str
from django.utils import six from django.utils import six
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
@ -280,7 +280,7 @@ class FileField(Field):
setattr(cls, self.name, self.descriptor_class(self)) setattr(cls, self.name, self.descriptor_class(self))
def get_directory_name(self): def get_directory_name(self):
return os.path.normpath(force_text(datetime.datetime.now().strftime(smart_bytes(self.upload_to)))) return os.path.normpath(force_text(datetime.datetime.now().strftime(smart_str(self.upload_to))))
def get_filename(self, filename): def get_filename(self, filename):
return os.path.normpath(self.storage.get_valid_name(os.path.basename(filename))) return os.path.normpath(self.storage.get_valid_name(os.path.basename(filename)))