diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-05-29 18:29:12 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-05-29 18:34:29 -0400 |
| commit | f91df04b05e9cfcd043b94fafbaf0eed16774379 (patch) | |
| tree | 9fd383619d0c66b41df69fe7bb733d971d52c78e | |
| parent | 8fecf4b9cf439eca3926164f1bf6526060febfb9 (diff) | |
| download | sqlalchemy-f91df04b05e9cfcd043b94fafbaf0eed16774379.tar.gz | |
- repair for py3k
- fix test
| -rw-r--r-- | lib/sqlalchemy/dialects/postgresql/psycopg2.py | 7 | ||||
| -rw-r--r-- | test/dialect/test_postgresql.py | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/lib/sqlalchemy/dialects/postgresql/psycopg2.py b/lib/sqlalchemy/dialects/postgresql/psycopg2.py index 037a06418..c796c99c7 100644 --- a/lib/sqlalchemy/dialects/postgresql/psycopg2.py +++ b/lib/sqlalchemy/dialects/postgresql/psycopg2.py @@ -393,8 +393,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 86e10c06e..a8003e973 100644 --- a/test/dialect/test_postgresql.py +++ b/test/dialect/test_postgresql.py @@ -2900,8 +2900,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"' |