[Sqlalchemy-commits] [3414] sqlalchemy/trunk/lib/sqlalchemy/ext/associationproxy.py: Expand custom
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [3414] sqlalchemy/trunk/lib/sqlalchemy/ext/associationproxy.py: Expand custom assocproxy getter/setter support to scalar proxies
|
From: <co...@sq...> - 2007-08-23 15:48:53
|
<!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>[3414] sqlalchemy/trunk/lib/sqlalchemy/ext/associationproxy.py: Expand custom assocproxy getter/setter support to scalar proxies</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>3414</dd> <dt>Author</dt> <dd>jek</dd> <dt>Date</dt> <dd>2007-08-23 11:48:51 -0400 (Thu, 23 Aug 2007)</dd> </dl> <h3>Log Message</h3> <pre>Expand custom assocproxy getter/setter support to scalar proxies</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunklibsqlalchemyextassociationproxypy">sqlalchemy/trunk/lib/sqlalchemy/ext/associationproxy.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemytrunklibsqlalchemyextassociationproxypy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/ext/associationproxy.py (3413 => 3414)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/ext/associationproxy.py 2007-08-23 15:35:03 UTC (rev 3413) +++ sqlalchemy/trunk/lib/sqlalchemy/ext/associationproxy.py 2007-08-23 15:48:51 UTC (rev 3414) </span><span class="lines">@@ -148,9 +148,11 @@ </span><span class="cx"> return </span><span class="cx"> elif self.scalar is None: </span><span class="cx"> self.scalar = self._target_is_scalar() </span><ins>+ if self.scalar: + self._initialize_scalar_accessors() </ins><span class="cx"> </span><span class="cx"> if self.scalar: </span><del>- return getattr(getattr(obj, self.target_collection), self.value_attr) </del><ins>+ return self._scalar_get(getattr(obj, self.target_collection)) </ins><span class="cx"> else: </span><span class="cx"> try: </span><span class="cx"> return getattr(obj, self.key) </span><span class="lines">@@ -162,6 +164,8 @@ </span><span class="cx"> def __set__(self, obj, values): </span><span class="cx"> if self.scalar is None: </span><span class="cx"> self.scalar = self._target_is_scalar() </span><ins>+ if self.scalar: + self._initialize_scalar_accessors() </ins><span class="cx"> </span><span class="cx"> if self.scalar: </span><span class="cx"> creator = self.creator and self.creator or self.target_class </span><span class="lines">@@ -169,7 +173,7 @@ </span><span class="cx"> if target is None: </span><span class="cx"> setattr(obj, self.target_collection, creator(values)) </span><span class="cx"> else: </span><del>- setattr(target, self.value_attr, values) </del><ins>+ self._scalar_set(target, values) </ins><span class="cx"> else: </span><span class="cx"> proxy = self.__get__(obj, None) </span><span class="cx"> proxy.clear() </span><span class="lines">@@ -178,6 +182,13 @@ </span><span class="cx"> def __delete__(self, obj): </span><span class="cx"> delattr(obj, self.key) </span><span class="cx"> </span><ins>+ def _initialize_scalar_accessors(self): + if self.getset_factory: + get, set = self.getset_factory(None, self) + else: + get, set = self._default_getset(None) + self._scalar_get, self._scalar_set = get, set + </ins><span class="cx"> def _default_getset(self, collection_class): </span><span class="cx"> attr = self.value_attr </span><span class="cx"> getter = util.attrgetter(attr) </span></span></pre> </div> </div> </body> </html> |