Remove ipaddr code.

James William Pye · James William Pye · commit ba60d82cb00b · 2009-06-09T17:43:51.000-07:00
A little too quick to implement, but only a little wasted time.
diff --git a/postgresql/protocol/typio.py b/postgresql/protocol/typio.py
@@ -421,38 +421,8 @@ def numeric_unpack(x):
 	pg_types.CIRCLEOID : (circle_pack, circle_unpack),
 }
 
-# Conditionally use ipaddr.
-# Condition goes away when 3.0 is deprecated.
-try:
-	import ipaddr
-	def net_pack(ip):
-		family = None
-		converted = False
-		while family is None:
-			if isinstance(ip, ipaddr.IPv4):
-				family = 2
-			elif isinstance(ip, ipaddr.IPv6):
-				family = 3
-			else:
-				if converted is True:
-					raise ValueError("unknown IP type: " + repr(ip))
-				ip = ipaddr.IP(ip)
-				converted = True
-		return ts.net_pack((family, ip.prefixlen, ip.packed))
-
-	def net_unpack(data):
-		family, mask, data = ts.net_unpack(data)
-		if family in (2, 3):
-			v = ipaddr.IP(data)
-		else:
-			raise ValueError("unknown net family: " + repr(family))
-		v.prefixlen = mask
-		return v
-	oid_to_io[pg_types.CIDROID] = (net_pack, net_unpack)
-	oid_to_io[pg_types.INETOID] = (net_pack, net_unpack)
-except ImportError:
-	oid_to_io[pg_types.CIDROID] = (None, None)
-	oid_to_io[pg_types.INETOID] = (None, None)
+oid_to_io[pg_types.CIDROID] = (None, None)
+oid_to_io[pg_types.INETOID] = (None, None)
 
 def process_tuple(procs, tup, exception_handler):
 	"""
diff --git a/postgresql/test/test_driver.py b/postgresql/test/test_driver.py
@@ -270,38 +270,37 @@
 	),
 ]
 
-try:
-	import ipaddr
+if False:
+	# When an implementation does make it,
+	# re-enable these tests.
 	type_samples.append((
 		'inet', [
-			ipaddr.IPv4('255.255.255.255'),
-			ipaddr.IPv4('127.0.0.1'),
-			ipaddr.IPv4('10.0.0.1'),
-			ipaddr.IPv4('0.0.0.0'),
-			ipaddr.IPv6('::1'),
-			ipaddr.IPv6('ffff' + ':ffff'*7),
-			ipaddr.IPv6('fe80::1'),
-			ipaddr.IPv6('fe80::1'),
-			ipaddr.IPv6('0::0'),
+			IPAddress4('255.255.255.255'),
+			IPAddress4('127.0.0.1'),
+			IPAddress4('10.0.0.1'),
+			IPAddress4('0.0.0.0'),
+			IPAddress6('::1'),
+			IPAddress6('ffff' + ':ffff'*7),
+			IPAddress6('fe80::1'),
+			IPAddress6('fe80::1'),
+			IPAddress6('0::0'),
 		],
 	))
 	type_samples.append((
 		'cidr', [
-			ipaddr.IPv4('255.255.255.255/32'),
-			ipaddr.IPv4('127.0.0.0/8'),
-			ipaddr.IPv4('127.1.0.0/16'),
-			ipaddr.IPv4('10.0.0.0/32'),
-			ipaddr.IPv4('0.0.0.0/0'),
-			ipaddr.IPv6('ffff' + ':ffff'*7 + '/128'),
-			ipaddr.IPv6('::1/128'),
-			ipaddr.IPv6('fe80::1/128'),
-			ipaddr.IPv6('fe80::0/64'),
-			ipaddr.IPv6('fe80::0/16'),
-			ipaddr.IPv6('0::0/0'),
+			IPNetwork4('255.255.255.255/32'),
+			IPNetwork4('127.0.0.0/8'),
+			IPNetwork4('127.1.0.0/16'),
+			IPNetwork4('10.0.0.0/32'),
+			IPNetwork4('0.0.0.0/0'),
+			IPNetwork6('ffff' + ':ffff'*7 + '/128'),
+			IPNetwork6('::1/128'),
+			IPNetwork6('fe80::1/128'),
+			IPNetwork6('fe80::0/64'),
+			IPNetwork6('fe80::0/16'),
+			IPNetwork6('0::0/0'),
 		],
 	))
-except ImportError:
-	pass
 
 class test_driver(pg_unittest.TestCaseWithCluster):
 	"""
