diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-11-15 19:37:50 -0500 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-11-15 19:37:50 -0500 |
| commit | e1402efb198f96090833a9b561cdba8dee937f70 (patch) | |
| tree | c20dc33466476bbf394e8e19da7a045c8a008d08 /test/orm/test_merge.py | |
| parent | 756aa2724e495b8a969bca73d133b27615a343e7 (diff) | |
| download | sqlalchemy-e1402efb198f96090833a9b561cdba8dee937f70.tar.gz | |
- move sqlalchemy.test to test.lib
Diffstat (limited to 'test/orm/test_merge.py')
| -rw-r--r-- | test/orm/test_merge.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/orm/test_merge.py b/test/orm/test_merge.py index d63d7e086..47c4f0963 100644 --- a/test/orm/test_merge.py +++ b/test/orm/test_merge.py @@ -1,16 +1,16 @@ -from sqlalchemy.test.testing import assert_raises, assert_raises_message +from test.lib.testing import assert_raises, assert_raises_message import sqlalchemy as sa from sqlalchemy import Integer, PickleType, String import operator -from sqlalchemy.test import testing +from test.lib import testing from sqlalchemy.util import OrderedSet from sqlalchemy.orm import mapper, relationship, create_session, PropComparator, \ synonym, comparable_property, sessionmaker, attributes from sqlalchemy.orm.collections import attribute_mapped_collection from sqlalchemy.orm.interfaces import MapperOption -from sqlalchemy.test.testing import eq_, ne_ +from test.lib.testing import eq_, ne_ from test.orm import _base, _fixtures -from sqlalchemy.test.schema import Table, Column +from test.lib.schema import Table, Column class MergeTest(_fixtures.FixtureTest): """Session.merge() functionality""" |
