diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-05-26 20:44:34 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-05-26 20:44:34 -0400 |
| commit | 4276049e495b543db2e6b5a15a6ea62bbe27260a (patch) | |
| tree | dbdda87fbd39f224e10426838b85a8af297c21c7 | |
| parent | 5e6d7faea688946776e0faec9cb1b716b1ff9305 (diff) | |
| download | sqlalchemy-4276049e495b543db2e6b5a15a6ea62bbe27260a.tar.gz | |
fix test_execute w c extensions
| -rw-r--r-- | lib/sqlalchemy/util/__init__.py | 3 | ||||
| -rw-r--r-- | test/engine/test_execute.py | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/lib/sqlalchemy/util/__init__.py b/lib/sqlalchemy/util/__init__.py index 9e099b072..687abb39a 100644 --- a/lib/sqlalchemy/util/__init__.py +++ b/lib/sqlalchemy/util/__init__.py @@ -9,7 +9,8 @@ from .compat import callable, cmp, reduce, \ pickle, dottedgetter, parse_qsl, namedtuple, next, WeakSet, reraise, \ raise_from_cause, text_type, string_types, int_types, binary_type, \ quote_plus, with_metaclass, print_, itertools_filterfalse, u, ue, b,\ - unquote_plus, b64decode, b64encode, byte_buffer, itertools_filter + unquote_plus, b64decode, b64encode, byte_buffer, itertools_filter,\ + StringIO from ._collections import KeyedTuple, ImmutableContainer, immutabledict, \ Properties, OrderedProperties, ImmutableProperties, OrderedDict, \ diff --git a/test/engine/test_execute.py b/test/engine/test_execute.py index 8dca2d92a..1c577730b 100644 --- a/test/engine/test_execute.py +++ b/test/engine/test_execute.py @@ -19,7 +19,6 @@ from sqlalchemy.dialects.oracle.zxjdbc import ReturningParam from sqlalchemy.engine import result as _result, default from sqlalchemy.engine.base import Connection, Engine from sqlalchemy.testing import fixtures -import io users, metadata, users_autoinc = None, None, None class ExecuteTest(fixtures.TestBase): @@ -835,7 +834,7 @@ class EchoTest(fixtures.TestBase): class MockStrategyTest(fixtures.TestBase): def _engine_fixture(self): - buf = io.StringIO() + buf = util.StringIO() def dump(sql, *multiparams, **params): buf.write(util.text_type(sql.compile(dialect=engine.dialect))) engine = create_engine('postgresql://', strategy='mock', executor=dump) @@ -940,7 +939,6 @@ class ResultProxyTest(fixtures.TestBase): def test_row_c_sequence_check(self): import csv import collections - from io import StringIO metadata = MetaData() metadata.bind = 'sqlite://' @@ -953,7 +951,7 @@ class ResultProxyTest(fixtures.TestBase): users.insert().execute(name='Test') row = users.select().execute().fetchone() - s = StringIO() + s = util.StringIO() writer = csv.writer(s) # csv performs PySequenceCheck call writer.writerow(row) |