From a029efca446025427a12ed886484890be15329d4 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Mon, 20 Jan 2014 12:31:35 +0800 Subject: [PATCH] Removed an inactive system check for upload_to. Thanks to Simon Charette for the eagle eyes. --- django/db/models/fields/files.py | 14 -------------- .../invalid_models_tests/test_ordinary_fields.py | 16 ---------------- 2 files changed, 30 deletions(-) diff --git a/django/db/models/fields/files.py b/django/db/models/fields/files.py index cee54c8783..4a19fe9052 100644 --- a/django/db/models/fields/files.py +++ b/django/db/models/fields/files.py @@ -238,24 +238,10 @@ class FileField(Field): def check(self, **kwargs): errors = super(FileField, self).check(**kwargs) - #errors.extend(self._check_upload_to()) errors.extend(self._check_unique()) errors.extend(self._check_primary_key()) return errors - def _check_upload_to(self): - if not self.upload_to: - return [ - checks.Error( - 'The field requires an "upload_to" attribute.', - hint=None, - obj=self, - id='E031', - ) - ] - else: - return [] - def _check_unique(self): if self._unique_set_explicitly: return [ diff --git a/tests/invalid_models_tests/test_ordinary_fields.py b/tests/invalid_models_tests/test_ordinary_fields.py index 9db8c95ce7..d14b907cdb 100644 --- a/tests/invalid_models_tests/test_ordinary_fields.py +++ b/tests/invalid_models_tests/test_ordinary_fields.py @@ -302,22 +302,6 @@ class FileFieldTests(IsolatedModelsTestCase): expected = [] self.assertEqual(errors, expected) - # def test_missing_upload_to(self): - # class Model(models.Model): - # field = models.FileField() - - # field = Model._meta.get_field('field') - # errors = field.check() - # expected = [ - # Error( - # 'The field requires an "upload_to" attribute.', - # hint=None, - # obj=field, - # id='E031', - # ), - # ] - # self.assertEqual(errors, expected) - def test_unique(self): class Model(models.Model): field = models.FileField(unique=False, upload_to='somewhere')