- repair for py3k

- fix test

diff --git a/lib/sqlalchemy/dialects/postgresql/psycopg2.py b/lib/sqlalchemy/dialects/postgresql/psycopg2.py
index da333e8eb49fc37983f8e295855d9b0f9931eff8..fcc1946ff4f6ac9408483fd44e6b5716da4c505c 100644 (file)
--- a/lib/sqlalchemy/dialects/postgresql/psycopg2.py
+++ b/lib/sqlalchemy/dialects/postgresql/psycopg2.py
@@ -392,8 +392,13 @@ class PGDialect_psycopg2(PGDialect):
                 hstore_oids = self._hstore_oids(conn)
                 if hstore_oids is not None:
                     oid, array_oid = hstore_oids
-                    extras.register_hstore(conn, oid=oid, array_oid=array_oid,
+                    if util.py2k:
+                        extras.register_hstore(conn, oid=oid,
+                                        array_oid=array_oid,
                                            unicode=True)
+                    else:
+                        extras.register_hstore(conn, oid=oid,
+                                        array_oid=array_oid)
             fns.append(on_connect)
 
         if fns:

diff --git a/test/dialect/test_postgresql.py b/test/dialect/test_postgresql.py
index 3931a1968e1e6e6df494dd124869be22248b2dcb..00e5c07ab11c8c5976dbc40700ea7a28d76336e7 100644 (file)
--- a/test/dialect/test_postgresql.py
+++ b/test/dialect/test_postgresql.py
@@ -2901,8 +2901,8 @@ class HStoreTest(fixtures.TestBase):
                     dialect, None)
         assert_raises_message(
             ValueError,
-            r'''After '\[\.\.\.\], "key1"=>"value1", ', could not parse '''
-            '''residual at position 36: 'crapcrapcrap, "key3"\[\.\.\.\]''',
+            r'''After u?'\[\.\.\.\], "key1"=>"value1", ', could not parse '''
+            '''residual at position 36: u?'crapcrapcrap, "key3"\[\.\.\.\]''',
             proc,
             '"key2"=>"value2", "key1"=>"value1", '
                         'crapcrapcrap, "key3"=>"value3"'