Make MonkeyPatchedBinaryTest not fail on Python 2.5 (which doesn't have

the `b` notation for byte string literals)

diff --git a/lib/sqlalchemy/util/compat.py b/lib/sqlalchemy/util/compat.py
index 12d349a5b86e36d05afabada774fe2b34513ed5f..2a0f06f8ecbbafaa9f3248255b506de2ac2b3b54 100644 (file)
--- 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
+

diff --git a/test/dialect/test_mssql.py b/test/dialect/test_mssql.py
index 769f47e227dde7542eaaad2fc48b336765933123..08c72a0ec886f83e2961fd4b205c3b7359967123 100644 (file)
--- a/test/dialect/test_mssql.py
+++ b/test/dialect/test_mssql.py
@@ -16,6 +16,7 @@ from sqlalchemy import testing
 from sqlalchemy.testing import emits_warning_on, assert_raises_message
 import decimal
 from sqlalchemy.engine.reflection import Inspector
+from sqlalchemy.util.compat import b
 
 class CompileTest(fixtures.TestBase, AssertsCompiledSQL):
     __dialect__ = mssql.dialect()
@@ -1935,7 +1936,7 @@ class MonkeyPatchedBinaryTest(fixtures.TestBase):
 
     def test_bytes(self):
         module = __import__('pymssql')
-        input = b'\x80\x03]q\x00X\x03\x00\x00\x00oneq\x01a.'
+        input = b('\x80\x03]q\x00X\x03\x00\x00\x00oneq\x01a.')
         expected_result = input
         result = module.Binary(input)
         eq_(result, expected_result)