summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/exceptions.txt18
-rw-r--r--docs/releases/1.6.txt2
2 files changed, 16 insertions, 4 deletions
diff --git a/docs/ref/exceptions.txt b/docs/ref/exceptions.txt
index f123ae2e59..93bb9ed251 100644
--- a/docs/ref/exceptions.txt
+++ b/docs/ref/exceptions.txt
@@ -119,18 +119,28 @@ NoReverseMatch
Database Exceptions
===================
-Django wraps the standard database exceptions :exc:`DatabaseError` and
-:exc:`IntegrityError` so that your Django code has a guaranteed common
-implementation of these classes. These database exceptions are
-provided in :mod:`django.db`.
+Django wraps the standard database exceptions so that your Django code has a
+guaranteed common implementation of these classes. These database exceptions
+are provided in :mod:`django.db`.
+.. exception:: Error
+.. exception:: InterfaceError
.. exception:: DatabaseError
+.. exception:: DataError
+.. exception:: OperationalError
.. exception:: IntegrityError
+.. exception:: InternalError
+.. exception:: ProgrammingError
+.. exception:: NotSupportedError
The Django wrappers for database exceptions behave exactly the same as
the underlying database exceptions. See :pep:`249`, the Python Database API
Specification v2.0, for further information.
+.. versionchanged:: 1.6
+ Previous version of Django only wrapped ``DatabaseError`` and
+ ``IntegrityError``.
+
.. exception:: models.ProtectedError
Raised to prevent deletion of referenced objects when using
diff --git a/docs/releases/1.6.txt b/docs/releases/1.6.txt
index 1083d4d515..c6a4fb2d5d 100644
--- a/docs/releases/1.6.txt
+++ b/docs/releases/1.6.txt
@@ -60,6 +60,8 @@ Minor features
* In addition to :lookup:`year`, :lookup:`month` and :lookup:`day`, the ORM
now supports :lookup:`hour`, :lookup:`minute` and :lookup:`second` lookups.
+* Django now wraps all PEP-249 exceptions.
+
* The default widgets for :class:`~django.forms.EmailField`,
:class:`~django.forms.URLField`, :class:`~django.forms.IntegerField`,
:class:`~django.forms.FloatField` and :class:`~django.forms.DecimalField` use