py3k fixes

diff --git a/lib/sqlalchemy/test/assertsql.py b/lib/sqlalchemy/test/assertsql.py
index dc2c6d40f8a8c38058ebacb9c6eaefb3ad4cc3f8..1af28794eda0cbc21145aae77ac820191ed77443 100644 (file)
--- a/lib/sqlalchemy/test/assertsql.py
+++ b/lib/sqlalchemy/test/assertsql.py
@@ -3,7 +3,6 @@ from sqlalchemy.interfaces import ConnectionProxy
 from sqlalchemy.engine.default import DefaultDialect
 from sqlalchemy.engine.base import Connection
 from sqlalchemy import util
-import testing
 import re
 
 class AssertRule(object):

diff --git a/lib/sqlalchemy/test/noseplugin.py b/lib/sqlalchemy/test/noseplugin.py
index 41c3bcdbacae22ea87942364cae6d63788b1919a..ddf4b32e4c5fa9509602a5376b37d14bc6e98d0f 100644 (file)
--- a/lib/sqlalchemy/test/noseplugin.py
+++ b/lib/sqlalchemy/test/noseplugin.py
@@ -75,7 +75,6 @@ class NoseSQLAlchemy(Plugin):
     def configure(self, options, conf):
         Plugin.configure(self, options, conf)
 
-        import testing, requires
         testing.db = db
         testing.requires = requires
 

diff --git a/lib/sqlalchemy/util.py b/lib/sqlalchemy/util.py
index 114aa6814e2cbecf06ae496adc53dc22fb6183a1..f970f3737d9df43e2fd187db9722beed74076950 100644 (file)
--- a/lib/sqlalchemy/util.py
+++ b/lib/sqlalchemy/util.py
@@ -949,7 +949,7 @@ class IdentitySet(object):
 
         if len(self) > len(other):
             return False
-        for m in itertools.ifilterfalse(other._members.has_key,
+        for m in itertools.ifilterfalse(other._members.__contains__,
                                         self._members.iterkeys()):
             return False
         return True

diff --git a/sqla_nose.py b/sqla_nose.py
new file mode 100644 (file)
index 0000000..0542b4e
--- /dev/null
+++ b/sqla_nose.py
@@ -0,0 +1,22 @@
+"""
+nose runner script.
+
+Only use this script if setuptools is not available, i.e. such as
+on Python 3K.  Otherwise consult README.unittests for the 
+recommended methods of running tests.
+
+"""
+
+import nose
+from sqlalchemy.test.noseplugin import NoseSQLAlchemy
+from sqlalchemy.util import py3k
+
+if __name__ == '__main__':
+    if py3k:
+        # this version breaks verbose output, 
+        # but is the only API that nose3 currently supports
+        nose.main(plugins=[NoseSQLAlchemy()])
+    else:
+        # this is the "correct" API
+        nose.main(addplugins=[NoseSQLAlchemy()])
+

diff --git a/test/base/test_utils.py b/test/base/test_utils.py
index 4ff2d2a45d86c5675f38eac24465475dc21b0755..e4c2eaba059309c5752067e1fda39b567ed9d2ac 100644 (file)
--- a/test/base/test_utils.py
+++ b/test/base/test_utils.py
@@ -261,7 +261,7 @@ class IdentitySetTest(TestBase):
         except TypeError:
             assert True
 
-        assert_raises(TypeError, cmp, ids)
+        assert_raises(TypeError, util.cmp, ids)
         assert_raises(TypeError, hash, ids)
 
     def test_difference(self):
@@ -326,11 +326,13 @@ class DictlikeIteritemsTest(TestBase):
         d = subdict(a=1,b=2,c=3)
         self._ok(d)
 
+    # Py2K
     def test_UserDict(self):
         import UserDict
         d = UserDict.UserDict(a=1,b=2,c=3)
         self._ok(d)
-
+    # end Py2K
+    
     def test_object(self):
         self._notok(object())
 
@@ -340,12 +342,15 @@ class DictlikeIteritemsTest(TestBase):
                 return iter(self.baseline)
         self._ok(duck1())
 
+    # Py2K
     def test_duck_2(self):
         class duck2(object):
             def items(duck):
                 return list(self.baseline)
         self._ok(duck2())
+    # end Py2K
 
+    # Py2K
     def test_duck_3(self):
         class duck3(object):
             def iterkeys(duck):
@@ -353,6 +358,7 @@ class DictlikeIteritemsTest(TestBase):
             def __getitem__(duck, key):
                 return dict(a=1,b=2,c=3).get(key)
         self._ok(duck3())
+    # end Py2K
 
     def test_duck_4(self):
         class duck4(object):

diff --git a/test/dialect/test_mysql.py b/test/dialect/test_mysql.py
index 7cf51a890c8cdd9fecc6612c823e22d92947339e..44cfe11f2c832ec57fb7a5cc6be7f2698a60043c 100644 (file)
--- a/test/dialect/test_mysql.py
+++ b/test/dialect/test_mysql.py
@@ -1,5 +1,9 @@
 from sqlalchemy.test.testing import eq_
+
+# Py2K
 import sets
+# end Py2K
+
 from sqlalchemy import *
 from sqlalchemy import sql, exc
 from sqlalchemy.dialects.mysql import base as mysql

diff --git a/test/sql/test_types.py b/test/sql/test_types.py
index 9d35ce7805d0adb2835cbfc95ef023582166f8a0..084fbede476e4bc1c7b4def09ee0d84dca1c5ab8 100644 (file)
--- a/test/sql/test_types.py
+++ b/test/sql/test_types.py
@@ -348,7 +348,7 @@ class UnicodeTest(TestBase, AssertsExecutionResults):
         u = Unicode(assert_unicode=True)
         uni = u.dialect_impl(testing.db.dialect).bind_processor(testing.db.dialect)
         # Py3K
-        #self.assertRaises(exc.InvalidRequestError, uni, b'x')
+        #assert_raises(exc.InvalidRequestError, uni, b'x')
         # Py2K
         assert_raises(exc.InvalidRequestError, uni, 'x')
         # end Py2K
@@ -356,7 +356,7 @@ class UnicodeTest(TestBase, AssertsExecutionResults):
         u = Unicode()
         uni = u.dialect_impl(testing.db.dialect).bind_processor(testing.db.dialect)
         # Py3K
-        #self.assertRaises(exc.SAWarning, uni, b'x')
+        #assert_raises(exc.SAWarning, uni, b'x')
         # Py2K
         assert_raises(exc.SAWarning, uni, 'x')
         # end Py2K
@@ -367,7 +367,7 @@ class UnicodeTest(TestBase, AssertsExecutionResults):
         s = String()
         uni = s.dialect_impl(unicode_engine.dialect).bind_processor(unicode_engine.dialect)
         # Py3K
-        #self.assertRaises(exc.InvalidRequestError, uni, b'x')
+        #assert_raises(exc.InvalidRequestError, uni, b'x')
         #assert isinstance(uni(unicodedata), bytes)
         # Py2K
         assert_raises(exc.InvalidRequestError, uni, 'x')

diff --git a/test/zblog/mappers.py b/test/zblog/mappers.py
index 5203bd866a41c3cf573351acedfc11917a42b863..126d2c5684b34505987bb7035bc9913273fe52ff 100644 (file)
--- a/test/zblog/mappers.py
+++ b/test/zblog/mappers.py
@@ -1,7 +1,7 @@
 """mapper.py - defines mappers for domain objects, mapping operations"""
 
-import tables, user
-from blog import *
+from test.zblog import tables, user
+from test.zblog.blog import *
 from sqlalchemy import *
 from sqlalchemy.orm import *
 import sqlalchemy.util as util

diff --git a/test/zblog/test_zblog.py b/test/zblog/test_zblog.py
index 8170766cb253bcb5f28e5359fbfd0cf599691447..5e46c1cebcf7f448681d38d3fbe28987ae166039 100644 (file)
--- a/test/zblog/test_zblog.py
+++ b/test/zblog/test_zblog.py
@@ -1,9 +1,9 @@
 from sqlalchemy import *
 from sqlalchemy.orm import *
 from sqlalchemy.test import *
-import mappers, tables
-from user import *
-from blog import *
+from test.zblog import mappers, tables
+from test.zblog.user import *
+from test.zblog.blog import *
 
 
 class ZBlogTest(TestBase, AssertsExecutionResults):