summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorMichael Scott <michael.scott250@gmail.com>2016-09-20 22:31:23 +0100
committerTim Graham <timograham@gmail.com>2016-10-28 20:11:03 -0400
commitec9ed07488aa46fa9d9fd70ed99e82fdf184632a (patch)
treec080eab116a5788deb0cdb93b82739f7ddf92d0c /django
parent625cd5bcb315154ed28061fefaf639aff54da7c2 (diff)
Fixed #27188 -- Allowed using unique=True with FileField.
Thanks Tim Graham for the initial patch.
Diffstat (limited to 'django')
-rw-r--r--django/db/models/fields/files.py14
1 files changed, 0 insertions, 14 deletions
diff --git a/django/db/models/fields/files.py b/django/db/models/fields/files.py
index b2c93227e7..e3497f2494 100644
--- a/django/db/models/fields/files.py
+++ b/django/db/models/fields/files.py
@@ -230,7 +230,6 @@ class FileField(Field):
def __init__(self, verbose_name=None, name=None, upload_to='', storage=None, **kwargs):
self._primary_key_set_explicitly = 'primary_key' in kwargs
- self._unique_set_explicitly = 'unique' in kwargs
self.storage = storage or default_storage
self.upload_to = upload_to
@@ -240,22 +239,9 @@ class FileField(Field):
def check(self, **kwargs):
errors = super(FileField, self).check(**kwargs)
- errors.extend(self._check_unique())
errors.extend(self._check_primary_key())
return errors
- def _check_unique(self):
- if self._unique_set_explicitly:
- return [
- checks.Error(
- "'unique' is not a valid argument for a %s." % self.__class__.__name__,
- obj=self,
- id='fields.E200',
- )
- ]
- else:
- return []
-
def _check_primary_key(self):
if self._primary_key_set_explicitly:
return [