*most* py3k warnings are resolved, with the exception of the various __setslice__ related warnings

I don't really know how to get rid of
This commit is contained in:
Mike Bayer
2008-12-18 18:46:27 +00:00
parent d76dc73f33
commit 5ddce0ea00
8 changed files with 26 additions and 29 deletions
+4 -3
View File
@@ -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