Don't try to be cute.

James William Pye · James William Pye · commit c33598bfd43d · 2010-03-25T21:20:54.000-07:00
diff --git a/postgresql/test/test_optimized.py b/postgresql/test/test_optimized.py
@@ -7,23 +7,20 @@
 from ..port import optimized
 from ..python.itertools import interlace
 
-# Curious... Seems too dangerous for real use..
-class SerializeNULL_Type(bytes):
-	def __len__(self):
-		return 0xFFFFFFFF
-SerializeNULL = SerializeNULL_Type(b'')
-
 def pack_tuple(*data,
 	packH = struct.Struct("!H").pack,
 	packL = struct.Struct("!L").pack
 ):
-	return packH(len(data)) + b''.join(interlace(map(packL, map(len, data)), data))
+	return packH(len(data)) + b''.join((
+		packL(len(x)) + x if x is not None else b'\xff\xff\xff\xff'
+		for x in data
+	))
 
 tuplemessages = (
 	(b'D', pack_tuple(b'foo', b'bar')),
-	(b'D', pack_tuple(b'foo', SerializeNULL, b'bar')),
+	(b'D', pack_tuple(b'foo', None, b'bar')),
 	(b'N', b'fee'),
-	(b'D', pack_tuple(b'foo', SerializeNULL, b'bar')),
+	(b'D', pack_tuple(b'foo', None, b'bar')),
 	(b'D', pack_tuple(b'foo', b'bar')),
 )
 
