[Sqlalchemy-commits] [1300] sqlalchemy/branches/schema/doc/build/content: doc stuff
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1300] sqlalchemy/branches/schema/doc/build/content: doc stuff
|
From: <co...@sq...> - 2006-04-19 20:41:41
|
<!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>[1300] sqlalchemy/branches/schema/doc/build/content: doc stuff</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1300</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-04-19 15:41:27 -0500 (Wed, 19 Apr 2006)</dd> </dl> <h3>Log Message</h3> <pre>doc stuff</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemybranchesschemadocbuildcomponentspydocmyt">sqlalchemy/branches/schema/doc/build/components/pydoc.myt</a></li> <li><a href="#sqlalchemybranchesschemadocbuildcontentdocstringsmyt">sqlalchemy/branches/schema/doc/build/content/docstrings.myt</a></li> <li><a href="#sqlalchemybranchesschemalibsqlalchemyenginebasepy">sqlalchemy/branches/schema/lib/sqlalchemy/engine/base.py</a></li> <li><a href="#sqlalchemybranchesschemalibsqlalchemyenginestrategiespy">sqlalchemy/branches/schema/lib/sqlalchemy/engine/strategies.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemybranchesschemadocbuildcomponentspydocmyt"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/doc/build/components/pydoc.myt (1299 => 1300)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/doc/build/components/pydoc.myt 2006-04-19 20:02:27 UTC (rev 1299) +++ sqlalchemy/branches/schema/doc/build/components/pydoc.myt 2006-04-19 20:41:27 UTC (rev 1300) </span><span class="lines">@@ -1,5 +1,5 @@ </span><span class="cx"> <%global> </span><del>- import re, types </del><ins>+ import re, types, string </ins><span class="cx"> def format_paragraphs(text): </span><span class="cx"> return re.sub(r'([\w ])\n([\w ])', r'\1 \2', text or '', re.S) </span><span class="cx"> </%global> </span><span class="lines">@@ -60,7 +60,15 @@ </span><span class="cx"> if isclass: </span><span class="cx"> description = "Class " + name </span><span class="cx"> if hasattr(obj, '__mro__'): </span><del>- description += "(" + obj.__mro__[1].__name__ + ")" </del><ins>+ l = [] + mro = list(obj.__mro__[1:]) + mro.reverse() + for x in mro: + for y in x.__mro__[1:]: + if y in l: + del l[l.index(y)] + l.insert(0, x) + description += "(" + string.join([x.__name__ for x in l], ',') + ")" </ins><span class="cx"> else: </span><span class="cx"> description = "Module " + name </span><span class="cx"> </%init> </span></span></pre></div> <a id="sqlalchemybranchesschemadocbuildcontentdocstringsmyt"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/doc/build/content/docstrings.myt (1299 => 1300)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/doc/build/content/docstrings.myt 2006-04-19 20:02:27 UTC (rev 1299) +++ sqlalchemy/branches/schema/doc/build/content/docstrings.myt 2006-04-19 20:41:27 UTC (rev 1300) </span><span class="lines">@@ -4,22 +4,26 @@ </span><span class="cx"> <%init> </span><span class="cx"> import sqlalchemy.schema as schema </span><span class="cx"> import sqlalchemy.engine as engine </span><ins>+ import sqlalchemy.engine.strategies as strategies </ins><span class="cx"> import sqlalchemy.sql as sql </span><span class="cx"> import sqlalchemy.pool as pool </span><span class="cx"> import sqlalchemy.mapping as mapping </span><span class="cx"> import sqlalchemy.exceptions as exceptions </span><span class="cx"> import sqlalchemy.ext.proxy as proxy </span><ins>+ import sqlalchemy.mods.threadlocal as threadlocal </ins><span class="cx"> </%init> </span><span class="cx"> </span><span class="cx"> </span><ins>+<& pydoc.myt:obj_doc, obj=sql, classes=[sql.Engine, sql.AbstractDialect, sql.ClauseParameters, sql.Compiled, sql.ClauseElement, sql.TableClause, sql.ColumnClause] &> </ins><span class="cx"> <& pydoc.myt:obj_doc, obj=schema &> </span><del>-<& pydoc.myt:obj_doc, obj=engine, classes=[engine.SQLSession, engine.SQLEngine, engine.ResultProxy, engine.RowProxy] &> -<& pydoc.myt:obj_doc, obj=sql, classes=[sql.ClauseParameters, sql.Compiled, sql.ClauseElement, sql.TableClause, sql.ColumnClause] &> -<& pydoc.myt:obj_doc, obj=pool, classes=[pool.DBProxy, pool.Pool, pool.QueuePool, pool.SingletonThreadPool] &> </del><ins>+<& pydoc.myt:obj_doc, obj=engine, classes=[engine.ComposedSQLEngine, engine.Connection, engine.Transaction, engine.Dialect, engine.ConnectionProvider, engine.ExecutionContext, engine.ResultProxy, engine.RowProxy] &> +<& pydoc.myt:obj_doc, obj=strategies &> </ins><span class="cx"> <& pydoc.myt:obj_doc, obj=mapping, classes=[mapping.Mapper, mapping.MapperExtension] &> </span><span class="cx"> <& pydoc.myt:obj_doc, obj=mapping.query, classes=[mapping.query.Query] &> </span><del>-<& pydoc.myt:obj_doc, obj=mapping.objectstore, classes=[mapping.objectstore.Session, mapping.objectstore.Session.SessionTrans] &> </del><ins>+<& pydoc.myt:obj_doc, obj=mapping.objectstore, classes=[mapping.objectstore.Session, mapping.objectstore.SessionTransaction] &> +<& pydoc.myt:obj_doc, obj=threadlocal &> </ins><span class="cx"> <& pydoc.myt:obj_doc, obj=exceptions &> </span><ins>+<& pydoc.myt:obj_doc, obj=pool, classes=[pool.DBProxy, pool.Pool, pool.QueuePool, pool.SingletonThreadPool] &> </ins><span class="cx"> <& pydoc.myt:obj_doc, obj=proxy &> </span><span class="cx"> </span><span class="cx"> </&> </span></span></pre></div> <a id="sqlalchemybranchesschemalibsqlalchemyenginebasepy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/lib/sqlalchemy/engine/base.py (1299 => 1300)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/engine/base.py 2006-04-19 20:02:27 UTC (rev 1299) +++ sqlalchemy/branches/schema/lib/sqlalchemy/engine/base.py 2006-04-19 20:41:27 UTC (rev 1300) </span><span class="lines">@@ -21,10 +21,13 @@ </span><span class="cx"> and a general consistentization of the behavior of various DBAPIs. </span><span class="cx"> </span><span class="cx"> The Dialect should also implement the following two attributes: </span><del>- </del><ins>+ </ins><span class="cx"> positional - True if the paramstyle for this Dialect is positional </span><ins>+ </ins><span class="cx"> paramstyle - the paramstyle to be used (some DBAPIs support multiple paramstyles) </span><ins>+ </ins><span class="cx"> convert_unicode - True if unicode conversion should be applied to all str types </span><ins>+ </ins><span class="cx"> encoding - type of encoding to use for unicode, usually defaults to 'utf-8' </span><span class="cx"> """ </span><span class="cx"> def create_connect_args(self, opts): </span><span class="lines">@@ -143,7 +146,9 @@ </span><span class="cx"> raise NotImplementedError() </span><span class="cx"> </span><span class="cx"> class Connection(object): </span><del>- """wraps a DBAPI connection to provide execution support for ClauseElements""" </del><ins>+ """represents a single DBAPI connection returned from the underlying connection pool. Provides + execution support for string-based SQL statements as well as ClauseElement, Compiled and DefaultGenerator objects. + provides a begin method to return Transaction objects.""" </ins><span class="cx"> def __init__(self, engine, connection=None, close_with_result=False): </span><span class="cx"> self.engine = engine </span><span class="cx"> self.connection = connection or engine.raw_connection() </span></span></pre></div> <a id="sqlalchemybranchesschemalibsqlalchemyenginestrategiespy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/lib/sqlalchemy/engine/strategies.py (1299 => 1300)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/engine/strategies.py 2006-04-19 20:02:27 UTC (rev 1299) +++ sqlalchemy/branches/schema/lib/sqlalchemy/engine/strategies.py 2006-04-19 20:41:27 UTC (rev 1300) </span><span class="lines">@@ -5,7 +5,7 @@ </span><span class="cx"> this can be accomplished via a mod; see the sqlalchemy/mods package for details.""" </span><span class="cx"> </span><span class="cx"> import re </span><del>-from cgi import parse_qsl </del><ins>+import cgi </ins><span class="cx"> </span><span class="cx"> from sqlalchemy.engine import base, default, transactional </span><span class="cx"> </span><span class="lines">@@ -100,7 +100,7 @@ </span><span class="cx"> m = re.match( r'(\w+)://(.*)', name) </span><span class="cx"> if m is not None: </span><span class="cx"> (name, args) = m.group(1, 2) </span><del>- opts = dict( parse_qsl( args ) ) </del><ins>+ opts = dict( cgi.parse_qsl( args ) ) </ins><span class="cx"> return (name, opts) </span><span class="cx"> else: </span><span class="cx"> return None </span></span></pre> </div> </div> </body> </html> |
