From 8e1cec1fcec8da1d2f857d2353101a5689177af7 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Mon, 16 Oct 2006 00:57:29 +0000 Subject: [PATCH] tweaks... --- doc/build/compile_docstrings.py | 4 +++- doc/build/components/pydoc.myt | 4 ++-- doc/build/content/document_base.myt | 4 ++-- doc/build/txt2myt.py | 4 ++-- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/doc/build/compile_docstrings.py b/doc/build/compile_docstrings.py index 44135b6ed0..fc6003c0e7 100644 --- a/doc/build/compile_docstrings.py +++ b/doc/build/compile_docstrings.py @@ -25,7 +25,9 @@ make_doc(obj=sql, classes=[]) make_doc(obj=schema) make_doc(obj=engine, classes=[engine.Connectable, engine.ComposedSQLEngine, engine.Connection, engine.Transaction, engine.Dialect, engine.ConnectionProvider, engine.ExecutionContext, engine.ResultProxy, engine.RowProxy]) make_doc(obj=engine.url) -make_doc(obj=orm) +make_doc(obj=orm, classes=[orm.MapperExtension]) +make_doc(obj=orm.mapperlib, classes=[orm.mapperlib.Mapper, orm.mapperlib.SelectionContext]) +make_doc(obj=orm.query, classes=[orm.query.Query, orm.query.QueryContext]) make_doc(obj=orm.session, classes=[orm.session.Session, orm.session.SessionTransaction]) make_doc(obj=pool, classes=[pool.DBProxy, pool.Pool, pool.QueuePool, pool.SingletonThreadPool]) make_doc(obj=sessioncontext) diff --git a/doc/build/components/pydoc.myt b/doc/build/components/pydoc.myt index 989ea2199c..d90f41ef70 100644 --- a/doc/build/components/pydoc.myt +++ b/doc/build/components/pydoc.myt @@ -1,7 +1,7 @@ <%global> import re, types, string, docstring def format_paragraphs(text): - return re.sub(r'([\w])\n([\w])', r'\1 \2', text or '', re.S) + return re.sub(r'([_\w])\n([_\w])', r'\1 \2', text or '', re.S) <%method obj_doc> @@ -60,4 +60,4 @@ <&|formatting.myt:member_doc, name=prop.name, link=prop.link &> <&|formatting.myt:formatplain&><% format_paragraphs(prop.doc) %> - \ No newline at end of file + diff --git a/doc/build/content/document_base.myt b/doc/build/content/document_base.myt index 137796d0d1..e4750c7563 100644 --- a/doc/build/content/document_base.myt +++ b/doc/build/content/document_base.myt @@ -23,8 +23,8 @@ wrapper='section_wrapper.myt' onepage='documentation' index='index' - title='SQLAlchemy 0.2 Documentation' - version = '0.2.8' + title='SQLAlchemy 0.3 Documentation' + version = '0.3.0' <%method title> diff --git a/doc/build/txt2myt.py b/doc/build/txt2myt.py index 3301a2b209..04e34dad61 100644 --- a/doc/build/txt2myt.py +++ b/doc/build/txt2myt.py @@ -202,7 +202,7 @@ def end_of_header(tree, level, start): return len(tree) def get_parent_map(tree): - return dict((c, p) for p in tree.getiterator() for c in p) + return dict([(c, p) for p in tree.getiterator() for c in p]) def html2myghtydoc(html): """Convert HTML to Myghty template (for SQLAlchemy's doc framework) @@ -270,7 +270,7 @@ def html2myghtydoc(html): " Modify .txt file if need you to change the content.-->\n" # discard surrounding tag - body = ''.join(tostring(e) for e in tree[:]) + body = ''.join([tostring(e) for e in tree[:]]) return header + body -- 2.47.2