summaryrefslogtreecommitdiff
path: root/test/testlib/assertsql.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2008-12-18 18:46:27 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2008-12-18 18:46:27 +0000
commit5ddce0ea00ff0534392ecabbb17b74becdcee4aa (patch)
treed147170332fe7ca79e93d5dc8a84cae33972d543 /test/testlib/assertsql.py
parentd76dc73f33b6607b3805dc0efa29a98057afdb55 (diff)
downloadsqlalchemy-5ddce0ea00ff0534392ecabbb17b74becdcee4aa.tar.gz
*most* py3k warnings are resolved, with the exception of the various __setslice__ related warnings
I don't really know how to get rid of
Diffstat (limited to 'test/testlib/assertsql.py')
-rw-r--r--test/testlib/assertsql.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/test/testlib/assertsql.py b/test/testlib/assertsql.py
index 1cafd041a..dc2c6d40f 100644
--- a/test/testlib/assertsql.py
+++ b/test/testlib/assertsql.py
@@ -2,6 +2,7 @@
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
@@ -72,7 +73,7 @@ class ExactSQL(SQLMatchRule):
equivalent = _received_statement == sql
if self.params:
- if callable(self.params):
+ if util.callable(self.params):
params = self.params(context)
else:
params = self.params
@@ -106,7 +107,7 @@ class RegexSQL(SQLMatchRule):
equivalent = bool(self.regex.match(_received_statement))
if self.params:
- if callable(self.params):
+ if util.callable(self.params):
params = self.params(context)
else:
params = self.params
@@ -148,7 +149,7 @@ class CompiledSQL(SQLMatchRule):
equivalent = self.statement == _received_statement
if self.params:
- if callable(self.params):
+ if util.callable(self.params):
params = self.params(context)
else:
params = self.params