merging 0.4 branch to trunk. see CHANGES for details. 0.3 moves to maintenance branch in branches/rel_0_3.

1 files changed, 4 insertions, 6 deletions

diff --git a/test/orm/entity.py b/test/orm/entity.py
index 86486cafc..da76e8df0 100644
--- a/test/orm/entity.py
+++ b/test/orm/entity.py
@@ -1,11 +1,9 @@
-from testbase import PersistTest, AssertMixin
-import unittest
-from sqlalchemy import *
 import testbase
+from sqlalchemy import *
+from sqlalchemy.orm import *
 from sqlalchemy.ext.sessioncontext import SessionContext
-
-from tables import *
-import tables
+from testlib import *
+from testlib.tables import *
 
 class EntityTest(AssertMixin):
     """tests mappers that are constructed based on "entity names", which allows the same class