From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Thu, 28 Jun 2007 18:25:39 +0000 (+0000)
Subject: some comparison fixes
X-Git-Tag: rel_0_4_6~169
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e94baeaacdbf8904eb5acc080896ee916a26ce59;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

some comparison fixes
---

diff --git a/test/orm/inheritance/polymorph2.py b/test/orm/inheritance/polymorph2.py
index 65650f6686..e493823f58 100644
--- a/test/orm/inheritance/polymorph2.py
+++ b/test/orm/inheritance/polymorph2.py
@@ -904,7 +904,7 @@ class CustomPKTest(testbase.ORMTest):
         
         # query using get(), using only one value.  this requires the select_table mapper
         # has the same single-col primary key.
-        assert sess.query(T1).get(ot1.id).id is ot1.id
+        assert sess.query(T1).get(ot1.id).id == ot1.id
         
         ot1 = sess.query(T1).get(ot1.id)
         ot1.data = 'hi'
@@ -946,7 +946,7 @@ class CustomPKTest(testbase.ORMTest):
 
         # query using get(), using only one value.  this requires the select_table mapper
         # has the same single-col primary key.
-        assert sess.query(T1).get(ot1.id).id is ot1.id
+        assert sess.query(T1).get(ot1.id).id == ot1.id
 
         ot1 = sess.query(T1).get(ot1.id)
         ot1.data = 'hi'
diff --git a/test/sql/generative.py b/test/sql/generative.py
index 18fa02dcfe..17b5e9cf06 100644
--- a/test/sql/generative.py
+++ b/test/sql/generative.py
@@ -121,7 +121,7 @@ class TraversalTest(testbase.AssertMixin):
         vis = Vis()
         s2 = vis.traverse(struct, clone=True)
         assert struct != s2
-        assert struct is not s2
+        assert not struct.is_other(s2)
         assert struct2 == s2
 
         class Vis2(ClauseVisitor):
@@ -137,6 +137,8 @@ class TraversalTest(testbase.AssertMixin):
         assert struct3 == s3
 
 class ClauseTest(testbase.AssertMixin):
+    """test copy-in-place behavior of various ClauseElements."""
+    
     def setUpAll(self):
         global t1, t2
         t1 = table("table1",