summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2013-03-24 14:32:50 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2013-03-24 14:32:50 -0400
commit9ca5b47fc9b0b48caf5af2f8c70cf38109e25b39 (patch)
treea1cf7876bcefd612808ccc40df92cfd4197a7505 /lib
parent5e66224d63cf1f23fce8a7fde83e791ca475f099 (diff)
parent728e2722017809856ebbc505dd330a99501dd5c8 (diff)
downloadsqlalchemy-9ca5b47fc9b0b48caf5af2f8c70cf38109e25b39.tar.gz
merge default
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
+