Changeset 14378 in genesis

Timestamp:

Jul 2, 2019, 8:32:28 AM (5 years ago)

Author:

rick

Message:

Fix getrange.py not working due python2

FreeBSD tends to default to python3 these days, so time to start converting all
stuff to python3.

File:

• tools/getrange.py (modified) (7 diffs)

tools/getrange.py

@@ -1 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Zoek de eerste vrije (== niet in een wleiden.conf gedefinieerde) interlink
@@ -9 +9 @@
 # 07/March/2012 - Rick van der Zwet <info@rickvanderzwet.nl>
 #
+import gformat
+import glob
 import re
 import sys
-import glob
-import gformat
+import textwrap
 
 def parseaddr(s):
   f = s.split('.')
-  return (long(f[0]) << 24L) + \
-    (long(f[1]) << 16L) + \
-    (long(f[2]) << 8L) + \
-    long(f[3])
+  return (int(f[0]) << 24) + \
+    (int(f[1]) << 16) + \
+    (int(f[2]) << 8) + \
+    (int(f[3]))
 
 
@@ -44 +45 @@
       for i in range(0, (1 << (32 - mask))):
         bezet[addr + i] = 1
-    except ValueError, e:
-      print "[FOUT] in address %s node %s" % (address, node)
+    except ValueError as e:
+      print("[FOUT] in address %s node %s" % (address, node))
   
   for node in gformat.get_hostlist():
@@ -82 +83 @@
   
   ranges = []
-  for n in xrange(aantal):
+  for n in range(aantal):
     okay = False
     while not okay: 
-      while bezet.has_key(i):
+      while i in bezet:
         i = i + numaddrs
       
@@ -91 +92 @@
       okay = True
       for j in range(numaddrs):
-        if bezet.has_key(i + j):
+        if (i + j) in bezet:
           i = i + numaddrs
           okay = False
@@ -105 +106 @@
 def main():
   if len(sys.argv) < 2:
-    print "Gebruik: %s <interlink|subnet> <grootte> [aantal]" % sys.argv[0]
-    print "Voorbeelden:"
-    print "\tVoor drie /29 interlinks - '%s interlink 29 3'" % sys.argv[0]
-    print "\tVoor een (1) /24 subnet  - '%s subnet 24'" % sys.argv[0]
+    print(textwrap.dedent('''
+        Gebruik: %(prog)s <interlink|subnet> <grootte> [aantal]
+        Voorbeelden:
+            Voor drie /29 interlinks - '%(prog)s interlink 29 3'
+            Voor een (1) /24 subnet  - '%(prog)s subnet 24'
+    ''' % { 'prog': sys.argv[0] }))
     exit(1)
   
@@ -123 +126 @@
 
   for i in ranges:
-    print "%s/%d:" % (showaddr(i), size),
+    print("%s/%d: " % (showaddr(i), size), end='')
     if size > 28:
-      print " en ".join([showaddr(i) for i in range(i + 1, i + numaddrs - 1)])
+      print(" en ".join([showaddr(i) for i in range(i + 1, i + numaddrs - 1)]))
     else:
-      print " en ".join([showaddr(i) for i in range(i + 1, i + 4)]),
-      print "...",
-      print " en ".join([showaddr(i) for i in range(i + numaddrs - 7, i + numaddrs - 4)])
+      print(" en ".join([showaddr(i) for i in range(i + 1, i + 4)]), end='')
+      print("...", end='')
+      print(" en ".join([showaddr(i) for i in range(i + numaddrs - 7, i + numaddrs - 4)]))
 
 if __name__ == "__main__":