Ticket #3119: filename_nomalizer_fix.diff

docs/model-api.txt

@@ -196 +196 @@
 
 A file-upload field.
 
-Has an extra required argument, ``upload_to``, a local filesystem path to
-which files should be upload. This path may contain `strftime formatting`_,
-which will be replaced by the date/time of the file upload (so that
-uploaded files don't fill up the given directory).
+A ``FileField`` has an extra required argument ``upload_to`` and an
+optional argument ``filename_normalizer``. The ``upload_to`` specifies a
+local filesystem path to which files should be upload. This path may
+contain `strftime formatting`_, which will be replaced by the date/time of
+the file upload (so that uploaded files don't fill up the given
+directory). The ``filename_normalizer`` is a function to "normalize"
+filename from the value provided from file-upload widget. The default value
+is set to ``django.utils.text.get_valid_filename`` which strips all
+non-ascii characters.
 
 The admin represents this as an ``<input type="file">`` (a file-upload widget).
 

django/db/models/fields/__init__.py

@@ -580 +580 @@
         return forms.EmailField(**defaults)
 
 class FileField(Field):
-    def __init__(self, verbose_name=None, name=None, upload_to='', **kwargs):
+    from django.utils.text import get_valid_filename
+    def __init__(self, verbose_name=None, name=None, upload_to='', filename_normalizer=get_valid_filename, **kwargs):
         self.upload_to = upload_to
+        self.filename_normalizer = filename_normalizer
         Field.__init__(self, verbose_name, name, **kwargs)
 
     def get_manipulator_fields(self, opts, manipulator, change, name_prefix='', rel=False, follow=True):
@@ -656 +658 @@
         return os.path.normpath(datetime.datetime.now().strftime(self.upload_to))
 
     def get_filename(self, filename):
-        from django.utils.text import get_valid_filename
-        f = os.path.join(self.get_directory_name(), get_valid_filename(os.path.basename(filename)))
+        f = os.path.join(self.get_directory_name(), self.filename_normalizer(os.path.basename(filename)))
         return os.path.normpath(f)
 
 class FilePathField(Field):