Thread: [Sqlalchemy-commits] [6036] sqlalchemy/branches/nosetests: fixes
Brought to you by:
zzzeek
From: <co...@sq...> - 2009-06-08 03:15:39
|
<!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>[6036] sqlalchemy/branches/nosetests: fixes</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>6036</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2009-06-07 23:15:35 -0400 (Sun, 07 Jun 2009)</dd> </dl> <h3>Log Message</h3> <pre>fixes</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemybranchesnosetestsconvertpy">sqlalchemy/branches/nosetests/convert.py</a></li> <li><a href="#sqlalchemybranchesnosetestslibsqlalchemytest__init__py">sqlalchemy/branches/nosetests/lib/sqlalchemy/test/__init__.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemybranchesnosetestsconvertpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/nosetests/convert.py (6035 => 6036)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/nosetests/convert.py 2009-06-08 03:14:13 UTC (rev 6035) +++ sqlalchemy/branches/nosetests/convert.py 2009-06-08 03:15:35 UTC (rev 6036) </span><span class="lines">@@ -192,8 +192,20 @@ </span><span class="cx"> replaced.insert(len(replaced) + i + 1, "%s@classmethod\n" % whitespace) </span><span class="cx"> replaced.append("%sdef insert_data(cls):\n" % whitespace) </span><span class="cx"> handlers.append((re.compile(r"\s*def insert_data\(self\)"), insert_data)) </span><ins>+ +def fixtures(lines, replaced, flags): + line = lines.pop(0) + whitespace = re.compile(r"(\s*)def fixtures").match(line).group(1) </ins><span class="cx"> </span><ins>+ i = -1 + while re.match("\s*@testing", replaced[i]): + i -= 1 + + replaced.insert(len(replaced) + i + 1, "%s@classmethod\n" % whitespace) + replaced.append("%sdef fixtures(cls):\n" % whitespace) +handlers.append((re.compile(r"\s*def fixtures\(self\)"), fixtures)) </ins><span class="cx"> </span><ins>+ </ins><span class="cx"> def call_main(lines, replaced, flags): </span><span class="cx"> replaced.pop(-1) </span><span class="cx"> lines.pop(0) </span><span class="lines">@@ -205,5 +217,5 @@ </span><span class="cx"> </span><span class="cx"> </span><span class="cx"> if __name__ == '__main__': </span><del>- convert("test/orm/query.py") -# walk() </del><ins>+# convert("test/orm/query.py") + walk() </ins></span></pre></div> <a id="sqlalchemybranchesnosetestslibsqlalchemytest__init__py"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/nosetests/lib/sqlalchemy/test/__init__.py (6035 => 6036)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/nosetests/lib/sqlalchemy/test/__init__.py 2009-06-08 03:14:13 UTC (rev 6035) +++ sqlalchemy/branches/nosetests/lib/sqlalchemy/test/__init__.py 2009-06-08 03:15:35 UTC (rev 6036) </span><span class="lines">@@ -23,7 +23,7 @@ </span><span class="cx"> 'rowset', </span><span class="cx"> 'TestBase', 'AssertsExecutionResults', </span><span class="cx"> 'AssertsCompiledSQL', 'ComparesTables', </span><del>- 'engines', </del><ins>+ 'engines', 'profiling', </ins><span class="cx"> '_function_named') </span><span class="cx"> </span><span class="cx"> </span></span></pre> </div> </div> </body> </html> |