From 2c176eb95cc53f29367e56e0a8eec336834a299d Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Fri, 16 May 2014 15:41:17 +0200 Subject: [PATCH] Refs #21798 - Modified error number to provide room for future expansion. --- django/db/models/fields/__init__.py | 2 +- docs/ref/checks.txt | 2 +- tests/invalid_models_tests/test_ordinary_fields.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py index f2c1471fef..968719759e 100644 --- a/django/db/models/fields/__init__.py +++ b/django/db/models/fields/__init__.py @@ -1097,7 +1097,7 @@ class DateTimeCheckMixin(object): "may be present.", hint=None, obj=self, - id='fields.E151', + id='fields.E160', ) ] else: diff --git a/docs/ref/checks.txt b/docs/ref/checks.txt index f03437e276..0787bd6635 100644 --- a/docs/ref/checks.txt +++ b/docs/ref/checks.txt @@ -67,7 +67,7 @@ Fields * **fields.E134**: ``max_digits`` must be greater or equal to ``decimal_places``. * **fields.E140**: FilePathFields must have either ``allow_files`` or ``allow_folders`` set to True. * **fields.E150**: GenericIPAddressFields cannot accept blank values if null values are not allowed, as blank values are stored as nulls. -* **fields.E151**: The options ``auto_now``, ``auto_now_add``, and ``default`` are mutually exclusive. Only one of these options may be present. +* **fields.E160**: The options ``auto_now``, ``auto_now_add``, and ``default`` are mutually exclusive. Only one of these options may be present. File Fields ~~~~~~~~~~~ diff --git a/tests/invalid_models_tests/test_ordinary_fields.py b/tests/invalid_models_tests/test_ordinary_fields.py index e42f9bcaaa..1d5ed6ea85 100644 --- a/tests/invalid_models_tests/test_ordinary_fields.py +++ b/tests/invalid_models_tests/test_ordinary_fields.py @@ -423,7 +423,7 @@ class DateFieldTests(IsolatedModelsTestCase): "may be present.", hint=None, obj=field, - id='fields.E151', + id='fields.E160', )] checks = field.check() self.assertEqual(checks, expected)