psycopg/psycopg2
1
1
Fork 0
mirror of https://github.com/psycopg/psycopg2.git synced 2025-10-31 15:57:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

The UUID adapter returns bytes instead of str in Python 3

Browse Source 
Also added __conform__ method to the adapter.
This commit is contained in:
Daniele Varrazzo 2013-04-07 18:06:43 +01:00
parent 5d3a5c242e
commit 29e96179f2
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/extras.py
View File

@ -449,13 +449,15 @@ class UUID_adapter(object):
def __init__(self, uuid): def __init__(self, uuid):
self._uuid = uuid self._uuid = uuid
def prepare(self, conn): def __conform__(self, proto):
pass if proto is _ext.ISQLQuote:
return self
def getquoted(self): def getquoted(self):
return "'"+str(self._uuid)+"'::uuid" return b("'%s'::uuid" % self._uuid)
__str__ = getquoted def __str__(self):
return "'%s'::uuid" % self._uuid
def register_uuid(oids=None, conn_or_curs=None): def register_uuid(oids=None, conn_or_curs=None):
"""Create the UUID type and an uuid.UUID adapter. """Create the UUID type and an uuid.UUID adapter.
@ -514,8 +516,8 @@ class Inet(object):
obj.prepare(self._conn) obj.prepare(self._conn)
return obj.getquoted() + b("::inet") return obj.getquoted() + b("::inet")
def __conform__(self, foo): def __conform__(self, proto):
if foo is _ext.ISQLQuote: if proto is _ext.ISQLQuote:
return self return self
def __str__(self): def __str__(self):