From dca6cffd6e687ef171cc70a7de392080f3c05a1b Mon Sep 17 00:00:00 2001 From: Daniele Varrazzo Date: Thu, 23 Feb 2012 14:37:15 +0000 Subject: [PATCH] Dropped custom array parsing for UUID[] Use the C generic array parsing exposed by new_array_type(). --- lib/extras.py | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/lib/extras.py b/lib/extras.py index 3237cabb..e1091e2d 100644 --- a/lib/extras.py +++ b/lib/extras.py @@ -473,18 +473,9 @@ def register_uuid(oids=None, conn_or_curs=None): oid1 = oids oid2 = 2951 - def parseUUIDARRAY(data, cursor): - if data is None: - return None - elif data == '{}': - return [] - else: - return [((len(x) > 0 and x != 'NULL') and uuid.UUID(x) or None) - for x in data[1:-1].split(',')] - _ext.UUID = _ext.new_type((oid1, ), "UUID", lambda data, cursor: data and uuid.UUID(data) or None) - _ext.UUIDARRAY = _ext.new_type((oid2,), "UUID[]", parseUUIDARRAY) + _ext.UUIDARRAY = _ext.new_array_type((oid2,), "UUID[]", _ext.UUID) _ext.register_type(_ext.UUID, conn_or_curs) _ext.register_type(_ext.UUIDARRAY, conn_or_curs)