From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Thu, 18 Nov 2010 23:57:33 +0000 (-0500)
Subject: merge tip
X-Git-Tag: rel_0_7b1~226^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd4f39648aa7949e2c64626982e401fcbc928e1f;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

merge tip
---

fd4f39648aa7949e2c64626982e401fcbc928e1f
diff --cc test/orm/test_relationships.py
index eadf17b399,03efa01832..9cd99320aa
--- a/test/orm/test_relationships.py
+++ b/test/orm/test_relationships.py
@@@ -1,12 -1,14 +1,14 @@@
 -from sqlalchemy.test.testing import assert_raises, assert_raises_message
 +from test.lib.testing import assert_raises, assert_raises_message
  import datetime
  import sqlalchemy as sa
 -from sqlalchemy.test import testing
 +from test.lib import testing
  from sqlalchemy import Integer, String, ForeignKey, MetaData, and_
 -from sqlalchemy.test.schema import Table, Column
 +from test.lib.schema import Table, Column
  from sqlalchemy.orm import mapper, relationship, relation, \
-                     backref, create_session, compile_mappers, clear_mappers, sessionmaker
+                     backref, create_session, compile_mappers, \
+                     clear_mappers, sessionmaker, attributes,\
+                     Session, composite, column_property
 -from sqlalchemy.test.testing import eq_, startswith_
 +from test.lib.testing import eq_, startswith_
  from test.orm import _base, _fixtures