[Sqlalchemy-commits] [1403] sqlalchemy/branches/schema/lib/sqlalchemy/orm: futher import repair...

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

<!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>[1403] sqlalchemy/branches/schema/lib/sqlalchemy/orm: futher import repair...</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd>1403</dd>
<dt>Author</dt> <dd>zzzeek</dd>
<dt>Date</dt> <dd>2006-05-05 11:25:43 -0500 (Fri, 05 May 2006)</dd>
</dl>

<h3>Log Message</h3>
<pre>futher import repair...</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#sqlalchemybranchesschemalibsqlalchemyorm__init__py">sqlalchemy/branches/schema/lib/sqlalchemy/orm/__init__.py</a></li>
<li><a href="#sqlalchemybranchesschemalibsqlalchemyormpropertiespy">sqlalchemy/branches/schema/lib/sqlalchemy/orm/properties.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 (1402 => 1403)</h4>
<pre class="diff"><span>
<span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/orm/__init__.py	2006-05-05 16:17:03 UTC (rev 1402)
+++ sqlalchemy/branches/schema/lib/sqlalchemy/orm/__init__.py	2006-05-05 16:25:43 UTC (rev 1403)
</span><span class="lines">@@ -18,7 +18,7 @@
</span><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><del>-        'cascade_mappers', 'polymorphic_union', 'current_session', 'create_session'
</del><ins>+        'cascade_mappers', 'polymorphic_union', 'current_session', 'create_session', 'class_mapper', 'object_mapper'
</ins><span class="cx">         ]
</span><span class="cx"> 
</span><span class="cx"> def relation(*args, **kwargs):
</span></span></pre></div>
<a id="sqlalchemybranchesschemalibsqlalchemyormpropertiespy"></a>
<div class="modfile"><h4>Modified: sqlalchemy/branches/schema/lib/sqlalchemy/orm/properties.py (1402 => 1403)</h4>
<pre class="diff"><span>
<span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/orm/properties.py	2006-05-05 16:17:03 UTC (rev 1402)
+++ sqlalchemy/branches/schema/lib/sqlalchemy/orm/properties.py	2006-05-05 16:25:43 UTC (rev 1403)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx">             sessionlib.global_attributes.register_attribute(parent.class_, key, uselist=False, callable_=lambda i:self.setup_loader(i))
</span><span class="cx">     def setup_loader(self, instance):
</span><span class="cx">         if not self.parent.is_assigned(instance):
</span><del>-            return object_mapper(instance).props[self.key].setup_loader(instance)
</del><ins>+            return mapper.object_mapper(instance).props[self.key].setup_loader(instance)
</ins><span class="cx">         def lazyload():
</span><span class="cx">             session = sessionlib.object_session(instance)
</span><span class="cx">             connection = session.connection(self.parent)
</span><span class="lines">@@ -181,13 +181,13 @@
</span><span class="cx">     def do_init(self, key, parent):
</span><span class="cx">         import sqlalchemy.orm
</span><span class="cx">         if isinstance(self.argument, type):
</span><del>-            self.mapper = sqlalchemy.orm.class_mapper(self.argument)
</del><ins>+            self.mapper = mapper.class_mapper(self.argument)
</ins><span class="cx">         else:
</span><span class="cx">             self.mapper = self.argument
</span><span class="cx"> 
</span><span class="cx">         if self.association is not None:
</span><span class="cx">             if isinstance(self.association, type):
</span><del>-                self.association = sqlalchemy.orm.class_mapper(self.association)
</del><ins>+                self.association = mapper.class_mapper(self.association)
</ins><span class="cx">         
</span><span class="cx">         self.target = self.mapper.select_table
</span><span class="cx">         self.key = key
</span><span class="lines">@@ -363,7 +363,7 @@
</span><span class="cx"> 
</span><span class="cx">     def setup_loader(self, instance):
</span><span class="cx">         if not self.parent.is_assigned(instance):
</span><del>-            return object_mapper(instance).props[self.key].setup_loader(instance)
</del><ins>+            return mapper.object_mapper(instance).props[self.key].setup_loader(instance)
</ins><span class="cx">         def lazyload():
</span><span class="cx">             params = {}
</span><span class="cx">             allparams = True
</span></span></pre>
</div>
</div>

</body>
</html>