From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sat, 28 Jan 2012 20:32:53 +0000 (-0500)
Subject: fix a few py3k bugs
X-Git-Tag: rel_0_7_5~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7f7ed210501a405938bf55e08a47e35674f0247;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

fix a few py3k bugs
---

diff --git a/lib/sqlalchemy/sql/compiler.py b/lib/sqlalchemy/sql/compiler.py
index 2690dd896d..b0a55b8865 100644
--- a/lib/sqlalchemy/sql/compiler.py
+++ b/lib/sqlalchemy/sql/compiler.py
@@ -1409,6 +1409,7 @@ class DDLCompiler(engine.Compiled):
                                                 column.name,
                                                 ce.args[0]
                                             )), None, sys.exc_info()[2]
+                # end Py2K
 
         const = self.create_table_constraints(table)
         if const:
diff --git a/test/engine/test_execute.py b/test/engine/test_execute.py
index 313e5b3b7c..03d98c0099 100644
--- a/test/engine/test_execute.py
+++ b/test/engine/test_execute.py
@@ -576,7 +576,7 @@ class MockStrategyTest(fixtures.TestBase):
     def _engine_fixture(self):
         buf = StringIO.StringIO()
         def dump(sql, *multiparams, **params):
-            buf.write(sql.compile(dialect=engine.dialect))
+            buf.write(unicode(sql.compile(dialect=engine.dialect)))
         engine = create_engine('postgresql://', strategy='mock', executor=dump)
         return engine, buf