summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell Keith-Magee <russell@keith-magee.com>2014-05-16 15:41:17 +0200
committerRussell Keith-Magee <russell@keith-magee.com>2014-05-16 15:41:17 +0200
commit2c176eb95cc53f29367e56e0a8eec336834a299d (patch)
tree802f148e7e3a89b76df96e935ba706ba07e1c967
parent393ddc10a78354b573b9e746247df013f7bd6151 (diff)
Refs #21798 - Modified error number to provide room for future expansion.
-rw-r--r--django/db/models/fields/__init__.py2
-rw-r--r--docs/ref/checks.txt2
-rw-r--r--tests/invalid_models_tests/test_ordinary_fields.py2
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)