added ansisql docs to output, moved exceptions to a more reasonable location

diff --git a/doc/build/gen_docstrings.py b/doc/build/gen_docstrings.py
index c9b9df09edd4446278f3b28e12a4eaeb2b241c06..1e61c778da399ffacbb47cc3d790b890d5ce352a 100644 (file)
--- a/doc/build/gen_docstrings.py
+++ b/doc/build/gen_docstrings.py
@@ -2,19 +2,12 @@ from toc import TOCElement
 import docstring
 import re
 
-import sqlalchemy.schema as schema
-import sqlalchemy.types as types
-import sqlalchemy.engine as engine
+from sqlalchemy import schema, types, ansisql, engine, sql, pool, orm, exceptions, databases
 import sqlalchemy.engine.strategies as strategies
-import sqlalchemy.sql as sql
-import sqlalchemy.pool as pool
-import sqlalchemy.orm as orm
-import sqlalchemy.exceptions as exceptions
 import sqlalchemy.ext.proxy as proxy
 import sqlalchemy.ext.sessioncontext as sessioncontext
 import sqlalchemy.mods.threadlocal as threadlocal
 import sqlalchemy.ext.selectresults as selectresults
-import sqlalchemy.databases as databases
 
 def make_doc(obj, classes=None, functions=None, **kwargs):
     """generate a docstring.ObjectDoc structure for an individual module, list of classes, and list of functions."""
@@ -30,15 +23,16 @@ def make_all_docs():
         make_doc(obj=types),
         make_doc(obj=engine),
         make_doc(obj=engine.url),
+        make_doc(obj=ansisql),
         make_doc(obj=orm),
         make_doc(obj=orm.mapperlib, classes=[orm.mapperlib.MapperExtension, orm.mapperlib.Mapper]),
         make_doc(obj=orm.query, classes=[orm.query.Query, orm.query.QueryContext, orm.query.SelectionContext]),
         make_doc(obj=orm.session, classes=[orm.session.Session, orm.session.SessionTransaction]),
+        make_doc(obj=exceptions),
         make_doc(obj=pool),
         make_doc(obj=sessioncontext),
         make_doc(obj=threadlocal),
         make_doc(obj=selectresults),
-        make_doc(obj=exceptions),
         make_doc(obj=proxy),
     ] + [make_doc(getattr(__import__('sqlalchemy.databases.%s' % m).databases, m)) for m in databases.__all__]
     return objects