[Sqlalchemy-commits] [1230] sqlalchemy/trunk/lib/sqlalchemy/mods: tweak...

SourceForge Headquarters 1320 Columbia Street Suite 310 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>[1230] sqlalchemy/trunk/lib/sqlalchemy/mods: tweak...</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd>1230</dd>
<dt>Author</dt> <dd>zzzeek</dd>
<dt>Date</dt> <dd>2006-03-31 01:29:28 -0600 (Fri, 31 Mar 2006)</dd>
</dl>

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

<h3>Modified Paths</h3>
<ul>
<li><a href="#sqlalchemytrunklibsqlalchemymappingmapperpy">sqlalchemy/trunk/lib/sqlalchemy/mapping/mapper.py</a></li>
<li><a href="#sqlalchemytrunklibsqlalchemymodsselectresultspy">sqlalchemy/trunk/lib/sqlalchemy/mods/selectresults.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="sqlalchemytrunklibsqlalchemymappingmapperpy"></a>
<div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/mapping/mapper.py (1229 => 1230)</h4>
<pre class="diff"><span>
<span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/mapping/mapper.py	2006-03-31 07:22:45 UTC (rev 1229)
+++ sqlalchemy/trunk/lib/sqlalchemy/mapping/mapper.py	2006-03-31 07:29:28 UTC (rev 1230)
</span><span class="lines">@@ -19,8 +19,8 @@
</span><span class="cx"> # a dictionary mapping classes to their primary mappers
</span><span class="cx"> mapper_registry = weakref.WeakKeyDictionary()
</span><span class="cx"> 
</span><del>-# a list of MapperExtensions that will be installed by default
-extensions = []
</del><ins>+# a list of MapperExtensions that will be installed in all mappers by default
+global_extensions = []
</ins><span class="cx"> 
</span><span class="cx"> # a constant returned by _getattrbycolumn to indicate
</span><span class="cx"> # this mapper is not handling an attribute for a particular
</span><span class="lines">@@ -56,13 +56,13 @@
</span><span class="cx">         
</span><span class="cx">         ext = MapperExtension()
</span><span class="cx">         
</span><del>-        for ext_class in extensions:
</del><ins>+        for ext_class in global_extensions:
</ins><span class="cx">             ext = ext_class().chain(ext)
</span><ins>+        
+        for ext_obj in util.to_list(extension):
+            ext = ext_obj.chain(ext)
</ins><span class="cx">             
</span><del>-        if extension is not None:
-            self.extension = extension.chain(ext)
-        else:
-            self.extension = ext
</del><ins>+        self.extension = ext
</ins><span class="cx"> 
</span><span class="cx">         self.class_ = class_
</span><span class="cx">         self.is_primary = is_primary
</span></span></pre></div>
<a id="sqlalchemytrunklibsqlalchemymodsselectresultspy"></a>
<div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/mods/selectresults.py (1229 => 1230)</h4>
<pre class="diff"><span>
<span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/mods/selectresults.py	2006-03-31 07:22:45 UTC (rev 1229)
+++ sqlalchemy/trunk/lib/sqlalchemy/mods/selectresults.py	2006-03-31 07:29:28 UTC (rev 1230)
</span><span class="lines">@@ -3,7 +3,7 @@
</span><span class="cx"> import sqlalchemy.mapping as mapping
</span><span class="cx"> 
</span><span class="cx"> def install_plugin():
</span><del>-    mapping.extensions.append(SelectResultsExt)
</del><ins>+    mapping.global_extensions.append(SelectResultsExt)
</ins><span class="cx">     
</span><span class="cx"> class SelectResultsExt(mapping.MapperExtension):
</span><span class="cx">     def select_by(self, mapper, *args, **params):
</span></span></pre>
</div>
</div>

</body>
</html>