Ticket #8918: file.patch

django/core/management/validation.py

@@ -44 +44 @@
                     e.add(opts, '"%s": DecimalFields require a "decimal_places" attribute.' % f.name)
                 if f.max_digits is None:
                     e.add(opts, '"%s": DecimalFields require a "max_digits" attribute.' % f.name)
-            if isinstance(f, models.FileField) and not f.upload_to:
-                e.add(opts, '"%s": FileFields require an "upload_to" attribute.' % f.name)
             if isinstance(f, models.ImageField):
                 try:
                     from PIL import Image

tests/modeltests/invalid_models/models.py

@@ -185 +185 @@
 model_errors = """invalid_models.fielderrors: "charfield": CharFields require a "max_length" attribute.
 invalid_models.fielderrors: "decimalfield": DecimalFields require a "decimal_places" attribute.
 invalid_models.fielderrors: "decimalfield": DecimalFields require a "max_digits" attribute.
-invalid_models.fielderrors: "filefield": FileFields require an "upload_to" attribute.
 invalid_models.fielderrors: "choices": "choices" should be iterable (e.g., a tuple or list).
 invalid_models.fielderrors: "choices2": "choices" should be a sequence of two-tuples.
 invalid_models.fielderrors: "choices2": "choices" should be a sequence of two-tuples.

tests/modeltests/files/models.py

@@ -33 +33 @@
     custom = models.FileField(storage=temp_storage, upload_to=custom_upload_to)
     random = models.FileField(storage=temp_storage, upload_to=random_upload_to)
     default = models.FileField(storage=temp_storage, upload_to='tests', default='tests/default.txt')
+    empty = models.FileField(storage=temp_storage, upload_to='')
 
 __test__ = {'API_TESTS':"""
 # Attempting to access a FileField from the class raises a descriptive error
@@ -134 +135 @@
 >>> obj4.random
 <FieldFile: .../random_file>
 
+# upload_to can be empty
+
+>>> obj5 = Storage()
+>>> obj5.empty.save('django_test.txt', ContentFile('more content'))
+>>> obj5.empty
+<FieldFile: ./django_test.txt>
+
 # Clean up the temporary files and dir.
 >>> obj1.normal.delete()
 >>> obj2.normal.delete()
 >>> obj3.default.delete()
 >>> obj4.random.delete()
+>>> obj5.empty.delete()
 >>> shutil.rmtree(temp_storage_location)
 """}

docs/ref/models/fields.txt

@@ -438 +438 @@
 ``FileField``
 -------------
 
-.. class:: FileField(upload_to=None, [max_length=100, **options])
+.. class:: FileField([upload_to='', max_length=100, **options])
 
 A file-upload field.
 
@@ -446 +446 @@
     The ``primary_key`` and ``unique`` arguments are not supported, and will
     raise a ``TypeError`` if used.
 
-Has one **required** argument:
+Has two optional arguments:
 
 .. attribute:: FileField.upload_to
 
@@ -484 +484 @@
                                 when determining the final destination path.
         ======================  ===============================================
 
-Also has one optional argument:
+    .. versionchanged:: 1.1
 
+    :attr:`~FileField.upload_to` is optional and empty by default.
+
 .. attribute:: FileField.storage
 
     .. versionadded:: 1.0
@@ -603 +605 @@
 ``ImageField``
 --------------
 
-.. class:: ImageField(upload_to=None, [height_field=None, width_field=None, max_length=100, **options])
+.. class:: ImageField([upload_to='', height_field=None, width_field=None, max_length=100, **options])
 
 Like :class:`FileField`, but validates that the uploaded object is a valid
 image. Has two extra optional arguments: