From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sun, 28 Nov 2010 21:29:39 +0000 (-0500)
Subject: merge backout
X-Git-Tag: rel_0_7b1~221
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec5b48d8fa51c5f7f2e83187708ec83c0510db8d;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

merge backout
---

ec5b48d8fa51c5f7f2e83187708ec83c0510db8d
diff --cc test/orm/test_merge.py
index fbdbcfe214,15c52a1e01..8effd6665d
--- a/test/orm/test_merge.py
+++ b/test/orm/test_merge.py
@@@ -2,17 -2,16 +2,16 @@@ from test.lib.testing import assert_rai
  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, Session
+ 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 sqlalchemy import event
 +from test.lib.schema import Table, Column
  
  class MergeTest(_fixtures.FixtureTest):
      """Session.merge() functionality"""