Fix raw_input for Py3 compatibility

[m_lib.git] / m_lib / mcrypt.py

diff --git a/m_lib/mcrypt.py b/m_lib/mcrypt.py
index acbead1f3f3426dcf8437597d39730977028302f..13357371147af122e0f08d1880ff6295a95318b0 100755 (executable)
--- a/m_lib/mcrypt.py
+++ b/m_lib/mcrypt.py
@@ -5,6 +5,7 @@
 #
 
 
+from __future__ import print_function
 import random, crypt
 
 
@@ -25,6 +26,11 @@ def gen_salt():
 
 
 def test():
+   try:
+      raw_input
+   except NameError:  # Python 3
+      raw_input = input
+
    passwd = raw_input("Enter password: ")
    salt = gen_salt()
    encrypted = crypt.crypt(passwd, salt)
@@ -32,17 +38,16 @@ def test():
    pwd_file = open("test.pwd", 'w')
    pwd_file.write("%s:%s" % ("user", encrypted))
    pwd_file.close()
-   print "Password file written"
+   print("Password file written")
 
-   import string
    pwd_file = open("test.pwd", 'r')
-   username, encrypted = string.split(pwd_file.readline()[:-1], ':')
+   username, encrypted = pwd_file.readline()[:-1].split(':')
    pwd_file.close()
 
    if crypt.crypt(encrypted, encrypted):
-      print "Password verified Ok"
+      print("Password verified Ok")
    else:
-      print "BAD password"
+      print("BAD password")
 
 if __name__ == "__main__":
    test()