- add doc pages for exceptions

diff --git a/doc/build/core/exceptions.rst b/doc/build/core/exceptions.rst
new file mode 100644 (file)
index 0000000..f7d384a
--- /dev/null
+++ b/doc/build/core/exceptions.rst
@@ -0,0 +1,6 @@
+Core Exceptions
+===============
+
+.. automodule:: sqlalchemy.exc
+    :show-inheritance:
+    :members:
\ No newline at end of file

diff --git a/doc/build/core/index.rst b/doc/build/core/index.rst
index bd7b56596130f83eacb3b2babb1e31873d13cda7..377d475e722f3373b3ab9e5e94fc623539cd8b4e 100644 (file)
--- a/doc/build/core/index.rst
+++ b/doc/build/core/index.rst
@@ -14,6 +14,7 @@ SQLAlchemy Core
     schema
     types
     interfaces
+    exceptions
     compiler
     serializer
     

diff --git a/doc/build/orm/exceptions.rst b/doc/build/orm/exceptions.rst
new file mode 100644 (file)
index 0000000..1dde424
--- /dev/null
+++ b/doc/build/orm/exceptions.rst
@@ -0,0 +1,6 @@
+ORM Exceptions
+==============
+
+.. automodule:: sqlalchemy.orm.exc
+    :show-inheritance:
+    :members:
\ No newline at end of file

diff --git a/doc/build/orm/index.rst b/doc/build/orm/index.rst
index a2e6fbf0abfb5240a4e04242a553125e542a8667..dafff384d37be8488dcc9385a46103f8de2b3c75 100644 (file)
--- a/doc/build/orm/index.rst
+++ b/doc/build/orm/index.rst
@@ -15,6 +15,7 @@ SQLAlchemy ORM
     query
     loading
     interfaces
+    exceptions
     extensions/index
     examples
     

diff --git a/doc/build/static/docs.css b/doc/build/static/docs.css
index 145e49b8c0b66a8e4a8fd9b22fce124aad9921ab..23513dbbad153296bfda28033853cafaa878c3f6 100644 (file)
--- a/doc/build/static/docs.css
+++ b/doc/build/static/docs.css
@@ -260,7 +260,8 @@ dl.function > dt,
 dl.attribute > dt,
 dl.classmethod > dt,
 dl.method > dt,
-dl.class > dt
+dl.class > dt,
+dl.exception > dt
 {
     background-color:#F0F0F0;
     margin:0px -10px;

diff --git a/lib/sqlalchemy/exc.py b/lib/sqlalchemy/exc.py
index 1c412824cc6dd5e1ced3f527c9a9cedb691c983d..003969f56ce50168b76d8158da862a81021c01dd 100644 (file)
--- a/lib/sqlalchemy/exc.py
+++ b/lib/sqlalchemy/exc.py
@@ -5,9 +5,9 @@
 
 """Exceptions used with SQLAlchemy.
 
-The base exception class is SQLAlchemyError.  Exceptions which are raised as a
+The base exception class is :class:`.SQLAlchemyError`.  Exceptions which are raised as a
 result of DBAPI exceptions are all subclasses of
-:class:`~sqlalchemy.exc.DBAPIError`.
+:class:`.DBAPIError`.
 
 """
 

diff --git a/lib/sqlalchemy/orm/exc.py b/lib/sqlalchemy/orm/exc.py
index 3f28a3dd3287111238635d11ac6f8c0c0b9f6788..8f257bdd51e5088ac858ee6d3c0f450b4949bc81 100644 (file)
--- a/lib/sqlalchemy/orm/exc.py
+++ b/lib/sqlalchemy/orm/exc.py
@@ -38,7 +38,7 @@ class FlushError(sa.exc.SQLAlchemyError):
 
 
 class UnmappedError(sa.exc.InvalidRequestError):
-    """TODO"""
+    """Base for exceptions that involve expected mappings not present."""
 
 class DetachedInstanceError(sa.exc.SQLAlchemyError):
     """An attempt to access unloaded attributes on a