Migrate all python scripts to python3

tools/conv.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # Read the wiki for more information
 # https://github.com/lennylxx/ipv6-hosts/wiki/sn-domains
@@ -23,7 +23,7 @@ def sn2iata(sn):
     for v in sn:
         if v in table:
             i = table.index(v)
-            i = (5 - i % 7) * 5 + i / 7 + 10
+            i = (5 - i % 7) * 5 + i // 7 + 10
             iata += table[i]
         else:
             iata += v
@@ -46,7 +46,7 @@ def code2num(code):
     for v in code:
         if v in table:
             i = table.index(v)
-            i = i / 7 + i % 7 - 1
+            i = i // 7 + i % 7 - 1
             num += str(i)
         else:
             num += v
@@ -54,7 +54,7 @@ def code2num(code):
 
 def main():
     if len(sys.argv) != 3:
-        print 'usage:\tconv -i iata\n\tconv -s sn\n\tconv -p isp\n\tconv -g ggc'
+        print('usage:\tconv -i iata\n\tconv -s sn\n\tconv -p isp\n\tconv -g ggc')
         sys.exit(1)
 
     input = sys.argv[2]
@@ -62,27 +62,34 @@ def main():
     if sys.argv[1] == '-i':
         ret += iata2sn(input[0:3])
         ret += num2code(input[3:5])
-        ret += 'n'
-        ret += num2code(input[6:8])
+        if (len(input) > 3):
+            ret += 'n'
+            ret += num2code(input[6:8])
     elif sys.argv[1] == '-s':
         ret += sn2iata(input[0:3])
         ret += code2num(input[3:5])
-        ret += 's'
-        ret += code2num(input[6:8])
+        if (len(input) > 3):
+            ret += 's'
+            ret += code2num(input[6:8])
     elif sys.argv[1] == '-p':
-        ret += iata2sn(input[:-1])
-        ret += num2code(input[-1])
+        lst = input.split('-')
+        ret += iata2sn(lst[0])
+        if (len(lst) == 2):
+            ret += '-'
+            ret += iata2sn(lst[1][0:3])
+            ret += num2code(lst[1][3:])
     elif sys.argv[1] == '-g':
         lst = input.split('-')
         ret += sn2iata(lst[0])
-        ret += "-"
-        ret += sn2iata(lst[1][0:3])
-        ret += code2num(lst[1][3:])
+        if (len(lst) == 2):
+            ret += '-'
+            ret += sn2iata(lst[1][0:3])
+            ret += code2num(lst[1][3:])
     else:
-        print 'Unknown option.'
+        print('Unknown option.')
         sys.exit(1)
 
-    print ret
+    print(ret)
     sys.exit(0)
 
 if __name__ == '__main__':

tools/list-1e100-all.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import sys
 
@@ -11,7 +11,7 @@ def main():
             continue
         arr = line.split()
         for k in range(0, 32):
-            print arr[1][:8] + '-in-x' + hex(k)[2:].zfill(2) + '.1e100.net' 
+            print(arr[1][:8] + '-in-x' + hex(k)[2:].zfill(2) + '.1e100.net')
 
 if __name__ == '__main__':
     main()

tools/list-1e100.py

@@ -1,28 +1,13 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import sys
 
-table = (
-    'ams', 'arn', 'atl', 'ber', 'bom', 'bru', 'bud', 'cbf',
-    'del', 'den', 'dfw', 'dub', 'eze', 'fra', 'gru', 'ham',
-    'hkg', 'iad', 'kix', 'kul', 'lax', 'lga', 'lhr', 'lis',
-    'maa', 'mad', 'mia', 'mil', 'mrs', 'muc', 'nrt', 'nuq',
-    'ord', 'par', 'pek', 'prg', 'qro', 'sea', 'sha', 'sin',
-    'sjc', 'sof', 'syd', 'tsa', 'waw', 'yyz', 'zrh'
-)
-
-def list_1e100(iata):
+def main():
+    iata = sys.argv[1]
     for i in range(1, 40):
         for j in range(1, 90):
-            print iata + str(i).zfill(2) + 's' + str(j).zfill(2) + '-in-'\
-                  'x' + '01.1e100.net'
-
-def main():
-    if len(sys.argv) > 1:
-        list_1e100(sys.argv[1])
-    else:
-        for iata in table:
-            list_1e100(iata)
+            print(iata + str(i).zfill(2) + 's' + str(j).zfill(2) + '-in-'\
+                  'x' + '01.1e100.net')
 
 if __name__ == '__main__':
     main()

tools/list-sn-all.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import sys
 
@@ -11,7 +11,7 @@ def main():
             continue
         arr = line.split()
         for k in range(1, 21):
-            print 'r%d' % k + arr[1][2:]
+            print('r%d' % k + arr[1][2:])
 
 if __name__ == '__main__':
     main()

tools/list-sn-spec.py

@@ -1,11 +1,11 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import sys
 
 def main():
     sn = sys.argv[1]
     for k in range(1, 21):
-        print 'r%d' % k + '---' + 'sn-' + sn + '.googlevideo.com'
+        print('r%d' % k + '---' + 'sn-' + sn + '.googlevideo.com')
 
 if __name__ == '__main__':
     main()

tools/list-sn.py

@@ -1,15 +1,15 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import sys
 from conv import num2code
 
 def main():
-    prefix = sys.argv[1]
+    encoded_iata = sys.argv[1]
     for i in range(0, 100):
         for j in range(0, 100):
-            sn = prefix + num2code(str(i).zfill(2)) + 'n' + num2code(str(j).zfill(2))
+            sn = encoded_iata + num2code(str(i).zfill(2)) + 'n' + num2code(str(j).zfill(2))
             dm = 'r2---' + 'sn-' + sn + '.googlevideo.com'
-            print dm
+            print(dm)
 
 if __name__ == '__main__':
     main()

tools/list-xx.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import sys
 
@@ -14,7 +14,7 @@ table = (
 def main():
     for xx in table:
         for i in range(0x00, 0x100):
-            print xx + '-in-' + 'x' + hex(i)[2:].zfill(2) + '.1e100.net'
+            print(xx + '-in-' + 'x' + hex(i)[2:].zfill(2) + '.1e100.net')
 
 if __name__ == '__main__':
     main()