X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=ipaddrset-test.py;h=16258f05b4985ee35a29df3d96ba6112346e2851;hb=564022994befb8f71b89ae015751b22c34ae3ee8;hp=a60a5e8c4022ef09ff99b60189bc8d816c2a250e;hpb=cfabda7e2a17f5d09454c184cd496aeb93c703af;p=secnet.git

diff --git a/ipaddrset-test.py b/ipaddrset-test.py
index a60a5e8..16258f0 100755
--- a/ipaddrset-test.py
+++ b/ipaddrset-test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 # This file is Free Software.  It was originally written for secnet.
 #
@@ -12,10 +12,6 @@
 # You may redistribute this fileand/or modify it under the terms of
 # the GNU General Public License as published by the Free Software
 # Foundation; either version 2, or (at your option) any later version.
-# Note however that this version of ipaddrset.py uses the Python
-# ipaddr library from Google, which is licenced only under the Apache
-# Licence, version 2.0, which is only compatible with the GNU GPL v3
-# (or perhaps later versions), and not with the GNU GPL v2.
 #
 # This software is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -29,42 +25,45 @@
 # The corresponding test vector file ise ipaddrset-test.expected.  I
 # don't believe it is a creative work that attracts copyright.  -iwj.
 
-import ipaddr
-from ipaddr import IPNetwork, IPAddress
+from __future__ import print_function
+from __future__ import unicode_literals
+
+import ipaddress
+from ipaddress import ip_network, ip_address
 
 import ipaddrset
 from ipaddrset import IPAddressSet
 
-v4a=IPAddress('172.18.45.6')
+v4a=ip_address('172.18.45.6')
 
 s=IPAddressSet()
-print 's =', s
-s.append([IPNetwork('172.18.45.0/24')])
-s.append([IPNetwork('2001:23:24::/48')])
-print s
+print('s =', s)
+s.append([ip_network('172.18.45.0/24')])
+s.append([ip_network('2001:23:24::/48')])
+print(s)
 
-t=IPAddressSet(map(IPNetwork,['172.31.80.8/32','172.18.45.192/28']))
-print 't =', t
-print t <= s
-print t == s
+t=IPAddressSet(map(ip_network,['172.31.80.8/32','172.18.45.192/28']))
+print('t =', t)
+print(t <= s)
+print(t == s)
 
 for n1s in ['172.18.44.0/23','172.18.45.6/32','172.18.45.0/24']:
-    n1=IPNetwork(n1s)
-    print n1
-    print s.contains(n1)
-    print t.contains(n1)
+    n1=ip_network(n1s)
+    print(n1)
+    print(s.contains(n1))
+    print(t.contains(n1))
 
 n=s.networks()[0]
 
 a=ipaddrset.complete_set()
-print 'a =', a
-print a >= s
-print a >= t
+print('a =', a)
+print(a >= s)
+print(a >= t)
 
-print '^'
-print s.intersection(t)
-print t.intersection(s)
+print('^')
+print(s.intersection(t))
+print(t.intersection(s))
 
-print 'u'
-print s.union(t)
-print t.union(s)
+print('u')
+print(s.union(t))
+print(t.union(s))