summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2013-03-24 14:32:19 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2013-03-24 14:32:19 -0400
commit728e2722017809856ebbc505dd330a99501dd5c8 (patch)
tree2ea701d714f40d2fcec25212eab2d8b952a4a049 /lib
parenta4703917d82a7100ff91d938c0592e39dd757a64 (diff)
parentf79b41243dd36214c583ce152132450def3a673e (diff)
downloadsqlalchemy-728e2722017809856ebbc505dd330a99501dd5c8.tar.gz
Merged in msabramo/sqlalchemy (pull request #48)
Make MonkeyPatchedBinaryTest only run when using mssql. Prevents failed
Diffstat (limited to 'lib')
-rw-r--r--lib/sqlalchemy/util/compat.py8
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/sqlalchemy/util/compat.py b/lib/sqlalchemy/util/compat.py
index 12d349a5b..2a0f06f8e 100644
--- a/lib/sqlalchemy/util/compat.py
+++ b/lib/sqlalchemy/util/compat.py
@@ -132,3 +132,11 @@ else:
return obj
return g
+# Adapted from six.py
+if py3k:
+ def b(s):
+ return s.encode("latin-1")
+else:
+ def b(s):
+ return s
+