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 46bf76fad6e969b880ec08c905113905b3cf91d6..cfaacc4907bbbbacd6d2b5003cc1339f88240aa0 100644 (file)
--- 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 e737accdbee11326d7a932d70d0da2d44f1fd272..8dca2d92a4bdf95ff38b51a0deff7caddc8e49d9 100644 (file)
--- 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