[Sqlalchemy-commits] [5131] sqlalchemy/trunk/lib/sqlalchemy/orm/scoping.py: Tidy.

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

<!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><meta http-equiv="content-type" content="text/html; charset=utf-8" /><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, #header, #footer { 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; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#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>[5131] sqlalchemy/trunk/lib/sqlalchemy/orm/scoping.py: Tidy.</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd>5131</dd>
<dt>Author</dt> <dd>jek</dd>
<dt>Date</dt> <dd>2008-09-27 20:04:09 -0400 (Sat, 27 Sep 2008)</dd>
</dl>

<h3>Log Message</h3>
<pre>Tidy.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#sqlalchemytrunklibsqlalchemyormscopingpy">sqlalchemy/trunk/lib/sqlalchemy/orm/scoping.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="sqlalchemytrunklibsqlalchemyormscopingpy"></a>
<div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/orm/scoping.py (5130 => 5131)</h4>
<pre class="diff"><span>
<span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/orm/scoping.py	2008-09-27 21:15:51 UTC (rev 5130)
+++ sqlalchemy/trunk/lib/sqlalchemy/orm/scoping.py	2008-09-28 00:04:09 UTC (rev 5131)
</span><span class="lines">@@ -179,9 +179,8 @@
</span><span class="cx">     def init_instance(self, mapper, class_, oldinit, instance, args, kwargs):
</span><span class="cx">         if self.save_on_init:
</span><span class="cx">             session = kwargs.pop('_sa_session', None)
</span><del>-
-        if self.save_on_init:
-            session = session or self.context.registry()
</del><ins>+            if session is None:
+                session = self.context.registry()
</ins><span class="cx">             session._save_without_cascade(instance)
</span><span class="cx">         return EXT_CONTINUE
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>