[Sqlalchemy-commits] [1402] sqlalchemy/branches/schema/lib/sqlalchemy/orm/__init__.py: more tweak
Brought to you by:
zzzeek
From: <co...@sq...> - 2006-05-05 16:17:14
|
<!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>[1402] sqlalchemy/branches/schema/lib/sqlalchemy/orm/__init__.py: more tweak</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1402</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-05-05 11:17:03 -0500 (Fri, 05 May 2006)</dd> </dl> <h3>Log Message</h3> <pre>more tweak</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemybranchesschemalibsqlalchemyorm__init__py">sqlalchemy/branches/schema/lib/sqlalchemy/orm/__init__.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemybranchesschemalibsqlalchemyorm__init__py"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/lib/sqlalchemy/orm/__init__.py (1401 => 1402)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/orm/__init__.py 2006-05-05 16:15:08 UTC (rev 1401) +++ sqlalchemy/branches/schema/lib/sqlalchemy/orm/__init__.py 2006-05-05 16:17:03 UTC (rev 1402) </span><span class="lines">@@ -8,17 +8,13 @@ </span><span class="cx"> the mapper package provides object-relational functionality, building upon the schema and sql </span><span class="cx"> packages and tying operations to class properties and constructors. </span><span class="cx"> """ </span><del>-import sqlalchemy.sql as sql -import sqlalchemy.schema as schema -import sqlalchemy.engine as engine -import sqlalchemy.util as util -import sqlalchemy.exceptions as exceptions </del><ins>+from sqlalchemy import sql, schema, engine, util, exceptions </ins><span class="cx"> from mapper import * </span><span class="cx"> from mapper import mapper_registry </span><span class="cx"> from util import polymorphic_union </span><span class="cx"> import properties </span><del>-from sqlalchemy.orm.session import current_session -from sqlalchemy.orm.session import Session as create_session </del><ins>+from session import current_session +from session import Session as create_session </ins><span class="cx"> </span><span class="cx"> __all__ = ['relation', 'backref', 'eagerload', 'lazyload', 'noload', 'deferred', 'defer', 'undefer', </span><span class="cx"> 'mapper', 'clear_mappers', 'sql', 'extension', 'class_mapper', 'object_mapper', 'MapperExtension', </span></span></pre> </div> </div> </body> </html> |