summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/dialects/postgresql
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2013-05-29 18:29:12 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2013-05-29 18:34:29 -0400
commitf91df04b05e9cfcd043b94fafbaf0eed16774379 (patch)
tree9fd383619d0c66b41df69fe7bb733d971d52c78e /lib/sqlalchemy/dialects/postgresql
parent8fecf4b9cf439eca3926164f1bf6526060febfb9 (diff)
downloadsqlalchemy-f91df04b05e9cfcd043b94fafbaf0eed16774379.tar.gz
- repair for py3k
- fix test
Diffstat (limited to 'lib/sqlalchemy/dialects/postgresql')
-rw-r--r--lib/sqlalchemy/dialects/postgresql/psycopg2.py7
1 files changed, 6 insertions, 1 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: