diff options
| author | Tim Graham <timograham@gmail.com> | 2016-12-31 10:30:41 -0500 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2017-01-17 20:52:02 -0500 |
| commit | bcf3532ede16407f1a701717deaed835eda3e87b (patch) | |
| tree | d4b6167d5c47c42fcae8f05dd86b03adb7faa33c /django | |
| parent | bc3540ce2c7cc59ec39a23ed16b14cc12f485bf3 (diff) | |
Refs #26154 -- Removed deprecated CommaSeparatedIntegerField.
Diffstat (limited to 'django')
| -rw-r--r-- | django/db/backends/mysql/base.py | 1 | ||||
| -rw-r--r-- | django/db/backends/oracle/base.py | 1 | ||||
| -rw-r--r-- | django/db/backends/postgresql/base.py | 1 | ||||
| -rw-r--r-- | django/db/backends/sqlite3/base.py | 1 | ||||
| -rw-r--r-- | django/db/models/fields/__init__.py | 21 |
5 files changed, 6 insertions, 19 deletions
diff --git a/django/db/backends/mysql/base.py b/django/db/backends/mysql/base.py index d7bb129744..a2416c82cd 100644 --- a/django/db/backends/mysql/base.py +++ b/django/db/backends/mysql/base.py @@ -135,7 +135,6 @@ class DatabaseWrapper(BaseDatabaseWrapper): 'BinaryField': 'longblob', 'BooleanField': 'bool', 'CharField': 'varchar(%(max_length)s)', - 'CommaSeparatedIntegerField': 'varchar(%(max_length)s)', 'DateField': 'date', 'DateTimeField': 'datetime', 'DecimalField': 'numeric(%(max_digits)s, %(decimal_places)s)', diff --git a/django/db/backends/oracle/base.py b/django/db/backends/oracle/base.py index c40a515f33..cf17f9fa6c 100644 --- a/django/db/backends/oracle/base.py +++ b/django/db/backends/oracle/base.py @@ -89,7 +89,6 @@ class DatabaseWrapper(BaseDatabaseWrapper): 'BinaryField': 'BLOB', 'BooleanField': 'NUMBER(1)', 'CharField': 'NVARCHAR2(%(max_length)s)', - 'CommaSeparatedIntegerField': 'VARCHAR2(%(max_length)s)', 'DateField': 'DATE', 'DateTimeField': 'TIMESTAMP', 'DecimalField': 'NUMBER(%(max_digits)s, %(decimal_places)s)', diff --git a/django/db/backends/postgresql/base.py b/django/db/backends/postgresql/base.py index c40a67b2e1..85a21a8905 100644 --- a/django/db/backends/postgresql/base.py +++ b/django/db/backends/postgresql/base.py @@ -76,7 +76,6 @@ class DatabaseWrapper(BaseDatabaseWrapper): 'BinaryField': 'bytea', 'BooleanField': 'boolean', 'CharField': 'varchar(%(max_length)s)', - 'CommaSeparatedIntegerField': 'varchar(%(max_length)s)', 'DateField': 'date', 'DateTimeField': 'timestamp with time zone', 'DecimalField': 'numeric(%(max_digits)s, %(decimal_places)s)', diff --git a/django/db/backends/sqlite3/base.py b/django/db/backends/sqlite3/base.py index 0c26882a57..252293d9cc 100644 --- a/django/db/backends/sqlite3/base.py +++ b/django/db/backends/sqlite3/base.py @@ -73,7 +73,6 @@ class DatabaseWrapper(BaseDatabaseWrapper): 'BinaryField': 'BLOB', 'BooleanField': 'bool', 'CharField': 'varchar(%(max_length)s)', - 'CommaSeparatedIntegerField': 'varchar(%(max_length)s)', 'DateField': 'date', 'DateTimeField': 'datetime', 'DecimalField': 'decimal', diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py index f5d6734aab..2018797564 100644 --- a/django/db/models/fields/__init__.py +++ b/django/db/models/fields/__init__.py @@ -1090,27 +1090,18 @@ class CharField(Field): class CommaSeparatedIntegerField(CharField): default_validators = [validators.validate_comma_separated_integer_list] description = _("Comma-separated integers") - system_check_deprecated_details = { + system_check_removed_details = { 'msg': ( - 'CommaSeparatedIntegerField has been deprecated. Support ' - 'for it (except in historical migrations) will be removed ' - 'in Django 2.0.' + 'CommaSeparatedIntegerField is removed except for support in ' + 'historical migrations.' ), 'hint': ( - 'Use CharField(validators=[validate_comma_separated_integer_list]) instead.' + 'Use CharField(validators=[validate_comma_separated_integer_list]) ' + 'instead.' ), - 'id': 'fields.W901', + 'id': 'fields.E901', } - def formfield(self, **kwargs): - defaults = { - 'error_messages': { - 'invalid': _('Enter only digits separated by commas.'), - } - } - defaults.update(kwargs) - return super(CommaSeparatedIntegerField, self).formfield(**defaults) - class DateTimeCheckMixin(object): |
