Update splitsuperperm.py

bin/splitsuperperm.py

@@ -1,7 +1,6 @@
 #!/usr/bin/python
 # -*- encoding: utf-8 -*-
-from __future__ import division
-
+from __future__ import print_function
 import argparse
 import math
 import sys
@@ -26,7 +25,6 @@ def permutations(n, superperm):
         if duplicates == 0: yield superperm[i : i + n]
         else: yield '...'
 
-
 def infer_n(superperm):
     """ The first n elements should be a permutation, so we can infer n """
     seen = set()
@@ -35,20 +33,19 @@ def infer_n(superperm):
             return i
         else:
             seen.add(c)
-    return i
-
+    """ Every value seen is unique => i + 1 MUST be returned """
+    return i + 1
 
 def split_superperm(superperm, opts):
     n = infer_n(superperm)
     if opts.count:
         perms = set(p for p in permutations(n, superperm) if p != '...')
         perm_count = len(perms)
         expected = math.factorial(n)
-        print '{}{}'.format(perm_count, '*' if perm_count == expected else '')
+        print('{}{}'.format(perm_count, '*' if perm_count == expected else ''))
     else:
         for p in permutations(n, superperm):
-            print p
-
+            print(p)
 
 def split_file(file, opts):
     for line in file:
@@ -60,18 +57,22 @@ def split_file(file, opts):
             continue
         split_superperm(line, opts)
 
-parser = argparse.ArgumentParser(description='Find permutations in a string')
-parser.add_argument('-c', '--count', action='store_true')
-parser.add_argument('-s', '--string')
-parser.add_argument('file', nargs='*')
-opts = parser.parse_args()
+def main():
+    parser = argparse.ArgumentParser(description='Find permutations in a string')
+    parser.add_argument('-c', '--count', action='store_true')
+    parser.add_argument('-s', '--string')
+    parser.add_argument('file', nargs='*')
+    opts = parser.parse_args()
 
-if opts.string:
-    split_superperm(opts.string, opts)
-elif len(opts.file) > 0:
-    for f in opts.file:
-        with open(f) as file:
-            split_file(file, opts)
-else:
-    split_file(sys.stdin, opts)
+    if opts.string:
+        split_superperm(opts.string, opts)
+    elif len(opts.file) > 0:
+        for f in opts.file:
+            with open(f) as file:
+                split_file(file, opts)
+    else:
+        split_file(sys.stdin, opts)
 
+if __name__ == "__main__":
+    # execute only if run as a script
+    main()