[Sqlalchemy-commits] [1259] sqlalchemy/trunk/lib/sqlalchemy/attributes.py: the ultimate "hands off"
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1259] sqlalchemy/trunk/lib/sqlalchemy/attributes.py: the ultimate "hands off" approach to the object's dictionary of managed attributes
|
From: <co...@sq...> - 2006-04-06 14:27:26
|
<!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>[1259] sqlalchemy/trunk/lib/sqlalchemy/attributes.py: the ultimate "hands off" approach to the object's dictionary of managed attributes</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1259</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-04-06 09:27:03 -0500 (Thu, 06 Apr 2006)</dd> </dl> <h3>Log Message</h3> <pre>the ultimate "hands off" approach to the object's dictionary of managed attributes</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunklibsqlalchemyattributespy">sqlalchemy/trunk/lib/sqlalchemy/attributes.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemytrunklibsqlalchemyattributespy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/attributes.py (1258 => 1259)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/attributes.py 2006-04-06 01:15:46 UTC (rev 1258) +++ sqlalchemy/trunk/lib/sqlalchemy/attributes.py 2006-04-06 14:27:03 UTC (rev 1259) </span><span class="lines">@@ -78,9 +78,10 @@ </span><span class="cx"> which occurs through the SmartProperty property object ultimately calls upon </span><span class="cx"> ManagedAttribute objects associated with the instance via this dictionary.""" </span><span class="cx"> def __init__(self, obj, key): </span><del>- self.__obj = weakref.ref(obj) </del><ins>+ #self.__obj = weakref.ref(obj) + self.obj = obj </ins><span class="cx"> self.key = key </span><del>- obj = property(lambda s:s.__obj()) </del><ins>+ #obj = property(lambda s:s.__obj()) </ins><span class="cx"> def history(self, **kwargs): </span><span class="cx"> return self </span><span class="cx"> def plain_init(self, *args, **kwargs): </span><span class="lines">@@ -493,6 +494,27 @@ </span><span class="cx"> the new object instance as an argument to create the new ManagedAttribute. </span><span class="cx"> Extra keyword arguments can be sent which </span><span class="cx"> will be passed along to newly created ManagedAttribute.""" </span><del>- class_._attribute_manager = self </del><ins>+ if not hasattr(class_, '_attribute_manager'): + class_._attribute_manager = self + class_._managed_attributes = ObjectAttributeGateway() </ins><span class="cx"> setattr(class_, key, self.create_prop(class_, key, uselist, callable_, **kwargs)) </span><span class="cx"> </span><ins>+managed_attributes = weakref.WeakKeyDictionary() + +class ObjectAttributeGateway(object): + """handles the dictionary of ManagedAttributes for instances. this level of indirection + is to prevent circular references upon objects, as well as keeping them Pickle-compatible.""" + def __set__(self, obj, value): + managed_attributes[obj] = value + def __delete__(self, obj): + try: + del managed_attributes[obj] + except KeyError: + raise AttributeError() + def __get__(self, obj, owner): + if obj is None: + return self + try: + return managed_attributes[obj] + except KeyError: + raise AttributeError() </ins><span class="cx">\ No newline at end of file </span></span></pre> </div> </div> </body> </html> |
