mirror of
https://github.com/psycopg/psycopg2.git
synced 2024-11-22 00:46:33 +03:00
The UUID adapter returns bytes instead of str in Python 3
Also added __conform__ method to the adapter.
This commit is contained in:
parent
cdbcd8a2e5
commit
6ab195d957
|
@ -450,13 +450,15 @@ class UUID_adapter(object):
|
|||
def __init__(self, uuid):
|
||||
self._uuid = uuid
|
||||
|
||||
def prepare(self, conn):
|
||||
pass
|
||||
def __conform__(self, proto):
|
||||
if proto is _ext.ISQLQuote:
|
||||
return 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):
|
||||
"""Create the UUID type and an uuid.UUID adapter.
|
||||
|
@ -515,8 +517,8 @@ class Inet(object):
|
|||
obj.prepare(self._conn)
|
||||
return obj.getquoted() + b("::inet")
|
||||
|
||||
def __conform__(self, foo):
|
||||
if foo is _ext.ISQLQuote:
|
||||
def __conform__(self, proto):
|
||||
if proto is _ext.ISQLQuote:
|
||||
return self
|
||||
|
||||
def __str__(self):
|
||||
|
|
Loading…
Reference in New Issue
Block a user