[Sqlalchemy-commits] [1122] sqlalchemy/trunk/lib/sqlalchemy/util.py: HistoryArrayList checks interna
Brought to you by:
zzzeek
From: <co...@sq...> - 2006-03-10 04:23:11
|
<!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>[1122] sqlalchemy/trunk/lib/sqlalchemy/util.py: HistoryArrayList checks internal list as a list or dict to clear it</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1122</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-03-09 22:22:59 -0600 (Thu, 09 Mar 2006)</dd> </dl> <h3>Log Message</h3> <pre>HistoryArrayList checks internal list as a list or dict to clear it</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunklibsqlalchemyutilpy">sqlalchemy/trunk/lib/sqlalchemy/util.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemytrunklibsqlalchemyutilpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/util.py (1121 => 1122)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/util.py 2006-03-09 18:30:27 UTC (rev 1121) +++ sqlalchemy/trunk/lib/sqlalchemy/util.py 2006-03-10 04:22:59 UTC (rev 1122) </span><span class="lines">@@ -365,14 +365,19 @@ </span><span class="cx"> for key, status in self.records.iteritems(): </span><span class="cx"> if status is False or status is None: </span><span class="cx"> list.append(key) </span><del>- self.data[:] = [] </del><ins>+ self._clear_data() </ins><span class="cx"> self.records = {} </span><span class="cx"> for l in list: </span><span class="cx"> self.append_nohistory(l) </span><span class="cx"> def clear(self): </span><span class="cx"> """clears the list and removes all history.""" </span><del>- self.data[:] = [] </del><ins>+ self._clear_data() </ins><span class="cx"> self.records = {} </span><ins>+ def _clear_data(self): + if isinstance(self.data, dict): + self.data.clear() + else: + self.data[:] = [] </ins><span class="cx"> def added_items(self): </span><span class="cx"> """returns a list of items that have been added since the last "committed" state.""" </span><span class="cx"> return [key for key in self.data if self.records[key] is True] </span></span></pre> </div> </div> </body> </html> |