[Sqlalchemy-commits] [1992] sqlalchemy/trunk/doc/build: tweaks...
Brought to you by:
zzzeek
From: <co...@sq...> - 2006-10-15 23:58:58
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head><style type="text/css"><!-- #msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; } #msg dt { float: left; width: 6em; font-weight: bold; } #msg dt:after { content:':';} #msg dl, #msg dt, #msg ul, #msg li { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; } #msg dl a { font-weight: bold} #msg dl a:link { color:#fc3; } #msg dl a:active { color:#ff0; } #msg dl a:visited { color:#cc6; } h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; } #msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; } #msg ul, pre { overflow: auto; } #patch { width: 100%; } #patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;} #patch .propset h4, #patch .binary h4 {margin:0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;} #patch .propset .diff, #patch .binary .diff {padding:10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;} #patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;} #patch .lines, .info {color:#888;background:#fff;} --></style> <title>[1992] sqlalchemy/trunk/doc/build: tweaks...</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1992</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-10-15 19:57:29 -0500 (Sun, 15 Oct 2006)</dd> </dl> <h3>Log Message</h3> <pre>tweaks...</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunkdocbuildcompile_docstringspy">sqlalchemy/trunk/doc/build/compile_docstrings.py</a></li> <li><a href="#sqlalchemytrunkdocbuildcomponentspydocmyt">sqlalchemy/trunk/doc/build/components/pydoc.myt</a></li> <li><a href="#sqlalchemytrunkdocbuildcontentdocument_basemyt">sqlalchemy/trunk/doc/build/content/document_base.myt</a></li> <li><a href="#sqlalchemytrunkdocbuildtxt2mytpy">sqlalchemy/trunk/doc/build/txt2myt.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemytrunkdocbuildcompile_docstringspy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/doc/build/compile_docstrings.py (1991 => 1992)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/doc/build/compile_docstrings.py 2006-10-16 00:37:53 UTC (rev 1991) +++ sqlalchemy/trunk/doc/build/compile_docstrings.py 2006-10-16 00:57:29 UTC (rev 1992) </span><span class="lines">@@ -25,7 +25,9 @@ </span><span class="cx"> make_doc(obj=schema) </span><span class="cx"> make_doc(obj=engine, classes=[engine.Connectable, engine.ComposedSQLEngine, engine.Connection, engine.Transaction, engine.Dialect, engine.ConnectionProvider, engine.ExecutionContext, engine.ResultProxy, engine.RowProxy]) </span><span class="cx"> make_doc(obj=engine.url) </span><del>-make_doc(obj=orm) </del><ins>+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]) </ins><span class="cx"> make_doc(obj=orm.session, classes=[orm.session.Session, orm.session.SessionTransaction]) </span><span class="cx"> make_doc(obj=pool, classes=[pool.DBProxy, pool.Pool, pool.QueuePool, pool.SingletonThreadPool]) </span><span class="cx"> make_doc(obj=sessioncontext) </span></span></pre></div> <a id="sqlalchemytrunkdocbuildcomponentspydocmyt"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/doc/build/components/pydoc.myt (1991 => 1992)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/doc/build/components/pydoc.myt 2006-10-16 00:37:53 UTC (rev 1991) +++ sqlalchemy/trunk/doc/build/components/pydoc.myt 2006-10-16 00:57:29 UTC (rev 1992) </span><span class="lines">@@ -1,7 +1,7 @@ </span><span class="cx"> <%global> </span><span class="cx"> import re, types, string, docstring </span><span class="cx"> def format_paragraphs(text): </span><del>- return re.sub(r'([\w])\n([\w])', r'\1 \2', text or '', re.S) </del><ins>+ return re.sub(r'([_\w])\n([_\w])', r'\1 \2', text or '', re.S) </ins><span class="cx"> </%global> </span><span class="cx"> </span><span class="cx"> <%method obj_doc> </span><span class="lines">@@ -60,4 +60,4 @@ </span><span class="cx"> <&|formatting.myt:member_doc, name=prop.name, link=prop.link &> </span><span class="cx"> <&|formatting.myt:formatplain&><% format_paragraphs(prop.doc) %></&> </span><span class="cx"> </&> </span><del>-</%method> </del><span class="cx">\ No newline at end of file </span><ins>+</%method> </ins></span></pre></div> <a id="sqlalchemytrunkdocbuildcontentdocument_basemyt"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/doc/build/content/document_base.myt (1991 => 1992)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/doc/build/content/document_base.myt 2006-10-16 00:37:53 UTC (rev 1991) +++ sqlalchemy/trunk/doc/build/content/document_base.myt 2006-10-16 00:57:29 UTC (rev 1992) </span><span class="lines">@@ -23,8 +23,8 @@ </span><span class="cx"> wrapper='section_wrapper.myt' </span><span class="cx"> onepage='documentation' </span><span class="cx"> index='index' </span><del>- title='SQLAlchemy 0.2 Documentation' - version = '0.2.8' </del><ins>+ title='SQLAlchemy 0.3 Documentation' + version = '0.3.0' </ins><span class="cx"> </%attr> </span><span class="cx"> </span><span class="cx"> <%method title> </span></span></pre></div> <a id="sqlalchemytrunkdocbuildtxt2mytpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/doc/build/txt2myt.py (1991 => 1992)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/doc/build/txt2myt.py 2006-10-16 00:37:53 UTC (rev 1991) +++ sqlalchemy/trunk/doc/build/txt2myt.py 2006-10-16 00:57:29 UTC (rev 1992) </span><span class="lines">@@ -202,7 +202,7 @@ </span><span class="cx"> return len(tree) </span><span class="cx"> </span><span class="cx"> def get_parent_map(tree): </span><del>- return dict((c, p) for p in tree.getiterator() for c in p) </del><ins>+ return dict([(c, p) for p in tree.getiterator() for c in p]) </ins><span class="cx"> </span><span class="cx"> def html2myghtydoc(html): </span><span class="cx"> """Convert HTML to Myghty template (for SQLAlchemy's doc framework) </span><span class="lines">@@ -270,7 +270,7 @@ </span><span class="cx"> " Modify .txt file if need you to change the content.-->\n" </span><span class="cx"> </span><span class="cx"> # discard surrounding <html> tag </span><del>- body = ''.join(tostring(e) for e in tree[:]) </del><ins>+ body = ''.join([tostring(e) for e in tree[:]]) </ins><span class="cx"> </span><span class="cx"> return header + body </span><span class="cx"> </span></span></pre> </div> </div> </body> </html> |