python3 conversions

diff --git a/bin/passwdgen b/bin/passwdgen
index 46a354950152d9c2c21f63c5df4a6a2fc3df3839..f7743818cc8c1c23d6116bb665a85ee0cbc02919 100755 (executable)
--- a/bin/passwdgen
+++ b/bin/passwdgen
@@ -1,15 +1,15 @@
-#!/usr/bin/python2
+#!/usr/bin/python3
 
-import random, string, sys
+import random, sys
 
-alnum_chars = filter(lambda c: c.isalnum(), map(chr, range(256)))
+alnum_chars = list(filter(lambda c: c.isalnum(), map(chr, range(128))))
 full_chars = alnum_chars * 2 + list("!@#%^&*(){}[]/=?+_-;:,.<>")
 
 def generate(chars, length):
-    return "".join([random.choice(chars) for i in xrange(length)])
+    return "".join([random.choice(chars) for i in range(length)])
 
 def print_usage():
-    print "Usage: %s [length] [alnum|full]" % sys.argv[0]
+    print("Usage: %s [length] [alnum|full]" % sys.argv[0])
     sys.exit(1)
 
 if __name__ == "__main__":
@@ -29,5 +29,5 @@ if __name__ == "__main__":
     else:
         print_usage()
 
-    print generate(chars, n)
+    print(generate(chars, n))
 

diff --git a/scripts/checkspace.py b/scripts/checkspace.py
index 1a88c0526b3bdbad18c1e375ed1ed2169e2d9e2d..f351ad2560ff364b73055d7ff95ea3d3d93a4849 100755 (executable)
--- a/scripts/checkspace.py
+++ b/scripts/checkspace.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/python3
 
 from __future__ import division
 
@@ -27,13 +27,13 @@ def check_path(path):
         warn = True
 
     if warn:
-        print "WARNING! %s has only %s remaining" % (path, pp_size(free))
+        print("WARNING! %s has only %s remaining" % (path, pp_size(free)))
 
 
 def main():
     paths = sys.argv[1:]
     if not paths:
-        print >>sys.stderr, "Usage: %s path" % sys.argv[0]
+        print("Usage: %s path" % sys.argv[0])
         sys.exit(1)
     for path in paths:
         check_path(path)