From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sat, 4 May 2013 19:29:04 +0000 (-0400)
Subject: test_execute up for sqlite, pg, oursql, mysql 2.7 + 3.3
X-Git-Tag: rel_0_9_0b1~304^2~13^2~46
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=920e134d53d32c644f0de487d6c40db99977ea4b;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

test_execute up for sqlite, pg, oursql, mysql 2.7 + 3.3
---

diff --git a/lib/sqlalchemy/testing/engines.py b/lib/sqlalchemy/testing/engines.py
index 46bf76fad6..cfaacc4907 100644
--- a/lib/sqlalchemy/testing/engines.py
+++ b/lib/sqlalchemy/testing/engines.py
@@ -1,4 +1,4 @@
-
+from __future__ import absolute_import
 
 import types
 import weakref
diff --git a/test/engine/test_execute.py b/test/engine/test_execute.py
index e737accdbe..8dca2d92a4 100644
--- a/test/engine/test_execute.py
+++ b/test/engine/test_execute.py
@@ -12,6 +12,7 @@ from sqlalchemy.testing.schema import Table, Column
 import sqlalchemy as tsa
 from sqlalchemy import testing
 from sqlalchemy.testing import engines
+from sqlalchemy import util
 from sqlalchemy.testing.engines import testing_engine
 import logging.handlers
 from sqlalchemy.dialects.oracle.zxjdbc import ReturningParam
@@ -836,7 +837,7 @@ class MockStrategyTest(fixtures.TestBase):
     def _engine_fixture(self):
         buf = io.StringIO()
         def dump(sql, *multiparams, **params):
-            buf.write(str(sql.compile(dialect=engine.dialect)))
+            buf.write(util.text_type(sql.compile(dialect=engine.dialect)))
         engine = create_engine('postgresql://', strategy='mock', executor=dump)
         return engine, buf