From: Mike Bayer Date: Sat, 23 Nov 2013 22:22:56 +0000 (-0500) Subject: -be more agnostic of quotes here X-Git-Tag: rel_0_8_4~19 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8ebcbc0be98cb75a01466f4e61afccc2869e7b3c;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git -be more agnostic of quotes here Conflicts: test/engine/test_execute.py --- diff --git a/test/engine/test_execute.py b/test/engine/test_execute.py index 76f7b9a718..daee642c79 100644 --- a/test/engine/test_execute.py +++ b/test/engine/test_execute.py @@ -249,11 +249,11 @@ class ExecuteTest(fixtures.TestBase): tsa.exc.StatementError, util.u( "A value is required for bind parameter 'uname'" - r'.*SELECT users.user_name AS "m\\xe9il"') if util.py2k + r'.*SELECT users.user_name AS .m\\xe9il.') if util.py2k else util.u( "A value is required for bind parameter 'uname'" - '.*SELECT users.user_name AS "méil"'), + '.*SELECT users.user_name AS .méil.'), testing.db.execute, select([users.c.user_name.label(name)]).where( users.c.user_name == bindparam("uname")),