[Sqlalchemy-commits] [5756] sqlalchemy/branches/rel_0_6/test/testlib: Callable must be defined befo
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [5756] sqlalchemy/branches/rel_0_6/test/testlib: Callable must be defined before path magic occurs.
|
From: <co...@sq...> - 2009-01-30 04:54:22
|
<!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>[5756] sqlalchemy/branches/rel_0_6/test/testlib: Callable must be defined before path magic occurs.</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>5756</dd> <dt>Author</dt> <dd>empty</dd> <dt>Date</dt> <dd>2009-01-29 23:54:19 -0500 (Thu, 29 Jan 2009)</dd> </dl> <h3>Log Message</h3> <pre>Callable must be defined before path magic occurs.</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemybranchesrel_0_6testtestlibcompatpy">sqlalchemy/branches/rel_0_6/test/testlib/compat.py</a></li> <li><a href="#sqlalchemybranchesrel_0_6testtestlibtestingpy">sqlalchemy/branches/rel_0_6/test/testlib/testing.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemybranchesrel_0_6testtestlibcompatpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/rel_0_6/test/testlib/compat.py (5755 => 5756)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/rel_0_6/test/testlib/compat.py 2009-01-30 04:35:43 UTC (rev 5755) +++ sqlalchemy/branches/rel_0_6/test/testlib/compat.py 2009-01-30 04:54:19 UTC (rev 5756) </span><span class="lines">@@ -12,5 +12,8 @@ </span><span class="cx"> fn.func_defaults, fn.func_closure) </span><span class="cx"> return fn </span><span class="cx"> </span><del>-from sqlalchemy.util import callable </del><ins>+try: + import callable +except ImportError: + callable = lambda x: hasattr(x, '__call__') </ins><span class="cx"> </span></span></pre></div> <a id="sqlalchemybranchesrel_0_6testtestlibtestingpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/rel_0_6/test/testlib/testing.py (5755 => 5756)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/rel_0_6/test/testlib/testing.py 2009-01-30 04:35:43 UTC (rev 5755) +++ sqlalchemy/branches/rel_0_6/test/testlib/testing.py 2009-01-30 04:54:19 UTC (rev 5756) </span><span class="lines">@@ -12,7 +12,7 @@ </span><span class="cx"> from cStringIO import StringIO </span><span class="cx"> </span><span class="cx"> import testlib.config as config </span><del>-from testlib.compat import _function_named, callable </del><ins>+from testlib.compat import _function_named </ins><span class="cx"> </span><span class="cx"> # Delayed imports </span><span class="cx"> MetaData = None </span></span></pre> </div> </div> </body> </html> |