Permalink
Browse files

Fixed #4776 -- Fixed a problem with handling of upload_to attributes.…

… The new

solution still works with non-ASCII filenames. Based on a patch from
mike.j.thompson@gmail.com.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5625 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent d91fb70 commit 3198b645169714af33af651b7d13c3f26a62c103 @malcolmt malcolmt committed Jul 6, 2007
Showing with 2 additions and 2 deletions.
  1. +2 −2 django/db/models/fields/__init__.py
View
4 django/db/models/fields/__init__.py
@@ -9,7 +9,7 @@
from django.utils.itercompat import tee
from django.utils.text import capfirst
from django.utils.translation import ugettext_lazy, ugettext as _
-from django.utils.encoding import smart_unicode
+from django.utils.encoding import smart_unicode, force_unicode, smart_str
import datetime, os, time
try:
import decimal
@@ -735,7 +735,7 @@ def save_file(self, new_data, new_object, original_object, change, rel, save=Tru
func(new_data[upload_field_name]["filename"], new_data[upload_field_name]["content"], save)
def get_directory_name(self):
- return os.path.normpath(datetime.datetime.now().strftime(self.upload_to))
+ return os.path.normpath(force_unicode(datetime.datetime.now().strftime(smart_str(self.upload_to))))
def get_filename(self, filename):
from django.utils.text import get_valid_filename

0 comments on commit 3198b64

Please sign in to comment.