summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2015-04-08 10:53:11 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2015-04-08 10:53:11 -0400
commit6ee3d6ce8177ebd6a742e76991627c2aa5488ef5 (patch)
tree61c448fa1c5da7f2302b92185b5a4c9a2fca4299 /lib/sqlalchemy
parent44a9820b4e02f65b3884fa2c016efce9663e4910 (diff)
parentc75c6732b115c136043eb5c74d4388abe865d2a3 (diff)
downloadsqlalchemy-6ee3d6ce8177ebd6a742e76991627c2aa5488ef5.tar.gz
Merge remote-tracking branch 'origin/pr/166' into pr166
Diffstat (limited to 'lib/sqlalchemy')
-rw-r--r--lib/sqlalchemy/dialects/mssql/pymssql.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/sqlalchemy/dialects/mssql/pymssql.py b/lib/sqlalchemy/dialects/mssql/pymssql.py
index 2214d18d1..324b3770c 100644
--- a/lib/sqlalchemy/dialects/mssql/pymssql.py
+++ b/lib/sqlalchemy/dialects/mssql/pymssql.py
@@ -46,11 +46,12 @@ class MSDialect_pymssql(MSDialect):
@classmethod
def dbapi(cls):
module = __import__('pymssql')
- # pymmsql doesn't have a Binary method. we use string
- # TODO: monkeypatching here is less than ideal
- module.Binary = lambda x: x if hasattr(x, 'decode') else str(x)
-
+ # pymmsql < 2.1.1 doesn't have a Binary method. we use string
client_ver = tuple(int(x) for x in module.__version__.split("."))
+ if client_ver < (2, 1, 1):
+ # TODO: monkeypatching here is less than ideal
+ module.Binary = lambda x: x if hasattr(x, 'decode') else str(x)
+
if client_ver < (1, ):
util.warn("The pymssql dialect expects at least "
"the 1.0 series of the pymssql DBAPI.")