Default the mask to max per Postgres' functionality.

James William Pye · James William Pye · commit ccc797b36fa5 · 2012-04-29T15:03:39.000-07:00
Patch submitted by Barry Grussling.
diff --git a/postgresql/test/test_types.py b/postgresql/test/test_types.py
@@ -235,7 +235,8 @@ def decode(x):
 		(0xffffffff, 0),
 		(0xffffffff // 2, 0xffff // 2),
 	],
-
+}
+__ = {
 	('cidr', typlib.net_pack, typlib.net_unpack) : [
 		(0, 0, b"\x00\x00\x00\x00"),
 		(2, 0, b"\x00" * 4),
diff --git a/postgresql/types/io/lib.py b/postgresql/types/io/lib.py
@@ -286,14 +286,14 @@ def net_pack(inet, len = len):
 	Supports cidr and inet types.
 	"""
 	slash_index = inet.find('/')
+	mask = None
 	if slash_index >= 0:
 		try:
 			mask = int(inet[slash_index+1:])
 		except ValueError:
 			raise ValueError('invalid mask in inet/cidr')
 		address = inet[:slash_index]
 	else:
-		mask = 0
 		address = inet
 	if inet.find(':') >= 0:
 		family = _PGSQL_AF_INET6
@@ -311,7 +311,7 @@ def net_pack(inet, len = len):
 		data = inet_pton(posix_family, address)
 	except socket_error as exc:
 		raise ValueError(str(exc)) from exc
-	if mask:
+	if mask is not None:
 		if not (0 <= mask <= max_mask):
 			raise ValueError('invalid mask in inet/cidr')
 		# Calculate optional cidr byte - PGSQL ignores this on input
@@ -321,6 +321,7 @@ def net_pack(inet, len = len):
 		is_cidr = 1 if (i_net == i_address) else 0
 	else:
 		is_cidr = 0
+		mask = max_mask
 	return bytes((family, mask, is_cidr, len(data))) + data
 
 def net_unpack(data, cidr=False, len=len):
@@ -351,7 +352,7 @@ def net_unpack(data, cidr=False, len=len):
 		raise ValueError(str(exc)) from exc
 	if not (0 <= mask <= max_mask):
 		raise ValueError("invalid mask parameter")
-	if cidr or mask:
+	if cidr or (mask and mask != max_mask):
 	    result = address + '/' + str(mask)
 	else:
 	    result = address
