From: Mike Bayer Date: Thu, 21 Nov 2013 18:49:30 +0000 (-0500) Subject: py3k fix for non-ascii SQL strings X-Git-Tag: rel_0_8_4~24 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7d6f6972ab6d3b1164bea8d674212b9106faa879;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git py3k fix for non-ascii SQL strings --- diff --git a/lib/sqlalchemy/testing/assertions.py b/lib/sqlalchemy/testing/assertions.py index d8b54dd353..6c790f08e1 100644 --- a/lib/sqlalchemy/testing/assertions.py +++ b/lib/sqlalchemy/testing/assertions.py @@ -208,8 +208,9 @@ class AssertsCompiledSQL(object): if util.py3k: param_str = param_str.encode('utf-8').decode('ascii', 'ignore') - - print("\nSQL String:\n" + util.text_type(c).encode('utf-8') + param_str) + print(("\nSQL String:\n" + util.text_type(c) + param_str).encode('utf-8')) + else: + print(("\nSQL String:\n" + util.text_type(c).encode('utf-8') + param_str)) cc = re.sub(r'[\n\t]', '', util.text_type(c))