[Sqlalchemy-commits] [5982] sqlalchemy/branches/rel_0_6: most ORM tests passing in py3. 1 with thes
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [5982] sqlalchemy/branches/rel_0_6: most ORM tests passing in py3. 1 with these changes
|
From: <co...@sq...> - 2009-05-26 17:21:45
|
<!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>[5982] sqlalchemy/branches/rel_0_6: most ORM tests passing in py3. 1 with these changes</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>5982</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2009-05-26 13:21:41 -0400 (Tue, 26 May 2009)</dd> </dl> <h3>Log Message</h3> <pre>most ORM tests passing in py3.1 with these changes</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemybranchesrel_0_6libsqlalchemyenginebasepy">sqlalchemy/branches/rel_0_6/lib/sqlalchemy/engine/base.py</a></li> <li><a href="#sqlalchemybranchesrel_0_6libsqlalchemyormquerypy">sqlalchemy/branches/rel_0_6/lib/sqlalchemy/orm/query.py</a></li> <li><a href="#sqlalchemybranchesrel_0_6testtestlibcompatpy">sqlalchemy/branches/rel_0_6/test/testlib/compat.py</a></li> <li><a href="#sqlalchemybranchesrel_0_6testtestlibsa_unittestpy">sqlalchemy/branches/rel_0_6/test/testlib/sa_unittest.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemybranchesrel_0_6libsqlalchemyenginebasepy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/rel_0_6/lib/sqlalchemy/engine/base.py (5981 => 5982)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/rel_0_6/lib/sqlalchemy/engine/base.py 2009-05-26 17:05:36 UTC (rev 5981) +++ sqlalchemy/branches/rel_0_6/lib/sqlalchemy/engine/base.py 2009-05-26 17:21:41 UTC (rev 5982) </span><span class="lines">@@ -1601,8 +1601,11 @@ </span><span class="cx"> for i, item in enumerate(metadata): </span><span class="cx"> colname = item[0] </span><span class="cx"> </span><ins>+ # Py3K + # Py2K </ins><span class="cx"> if self.dialect.description_encoding: </span><span class="cx"> colname = colname.decode(self.dialect.description_encoding) </span><ins>+ # end Py2K </ins><span class="cx"> </span><span class="cx"> if '.' in colname: </span><span class="cx"> # sqlite will in some circumstances prepend table name to colnames, so strip </span></span></pre></div> <a id="sqlalchemybranchesrel_0_6libsqlalchemyormquerypy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/rel_0_6/lib/sqlalchemy/orm/query.py (5981 => 5982)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/rel_0_6/lib/sqlalchemy/orm/query.py 2009-05-26 17:05:36 UTC (rev 5981) +++ sqlalchemy/branches/rel_0_6/lib/sqlalchemy/orm/query.py 2009-05-26 17:21:41 UTC (rev 5982) </span><span class="lines">@@ -579,7 +579,11 @@ </span><span class="cx"> def value(self, column): </span><span class="cx"> """Return a scalar result corresponding to the given column expression.""" </span><span class="cx"> try: </span><ins>+ # Py3K + #return self.values(column).__next__()[0] + # Py2K </ins><span class="cx"> return self.values(column).next()[0] </span><ins>+ # end Py2K </ins><span class="cx"> except StopIteration: </span><span class="cx"> return None </span><span class="cx"> </span></span></pre></div> <a id="sqlalchemybranchesrel_0_6testtestlibcompatpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/rel_0_6/test/testlib/compat.py (5981 => 5982)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/rel_0_6/test/testlib/compat.py 2009-05-26 17:05:36 UTC (rev 5981) +++ sqlalchemy/branches/rel_0_6/test/testlib/compat.py 2009-05-26 17:21:41 UTC (rev 5982) </span><span class="lines">@@ -5,7 +5,7 @@ </span><span class="cx"> import __builtin__ </span><span class="cx"> </span><span class="cx"> </span><del>-__all__ = '_function_named', 'callable', 'py3k', 'jython', 'to_list' </del><ins>+__all__ = '_function_named', 'callable', 'py3k', 'jython', 'to_list', 'cmp' </ins><span class="cx"> </span><span class="cx"> py3k = getattr(sys, 'py3kwarning', False) or sys.version_info >= (3, 0) </span><span class="cx"> </span><span class="lines">@@ -36,9 +36,13 @@ </span><span class="cx"> if py3k: </span><span class="cx"> def callable(fn): </span><span class="cx"> return hasattr(fn, '__call__') </span><ins>+ def cmp(a, b): + return (a > b) - (a < b) + </ins><span class="cx"> else: </span><span class="cx"> callable = __builtin__.callable </span><del>- </del><ins>+ cmp = __builtin__.cmp + </ins><span class="cx"> if sys.platform.startswith('java'): </span><span class="cx"> def gc_collect(*args): </span><span class="cx"> gc.collect() </span></span></pre></div> <a id="sqlalchemybranchesrel_0_6testtestlibsa_unittestpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/rel_0_6/test/testlib/sa_unittest.py (5981 => 5982)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/rel_0_6/test/testlib/sa_unittest.py 2009-05-26 17:05:36 UTC (rev 5981) +++ sqlalchemy/branches/rel_0_6/test/testlib/sa_unittest.py 2009-05-26 17:21:41 UTC (rev 5982) </span><span class="lines">@@ -41,7 +41,7 @@ </span><span class="cx"> import traceback </span><span class="cx"> import os </span><span class="cx"> import types </span><del>-from testlib.compat import callable </del><ins>+from testlib.compat import callable, cmp </ins><span class="cx"> </span><span class="cx"> ############################################################################## </span><span class="cx"> # Exported classes and functions </span></span></pre> </div> </div> </body> </html> |