Add compatibility with both Python 2 and 3 (#22)

* First version, still need to check all commands

* fix error with file conversion

* improve configparser stability

* new version number

Author: Kidel

bin/kathara_version.txt

@@ -1,2 +1 @@
-0.32.0
-
+0.33.0

bin/python/check.py

@@ -45,10 +45,6 @@
         print ("Invalid characters in machine names or link names\n")
         sys.exit(1)
 
-if sys.version_info >= (3, 0):
-    print ("Requires Python 2.x, not Python 3.x\n")
-    sys.exit(1)
-
 if nc.PLATFORM != nc.WINDOWS:
     if pwd.getpwuid(os.getuid()).pw_dir != os.environ['HOME']:
         print ("HOME variable is different from the real home directory. This won't allow labs to work.\n")

bin/python/command_utils.py

@@ -5,7 +5,7 @@ def run_command_detatched(cmd_line):
     process = subprocess.Popen(cmd_line, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
     # Poll process for new output until finished
     while True:
-        nextline = process.stdout.readline()
+        nextline = process.stdout.readline().decode('utf-8')
         if nextline == '' and process.poll() is not None:
             break
         sys.stderr.write(nextline)

bin/python/file_conversion.py

@@ -4,7 +4,7 @@
 def win2linux(filename):
     c = open(filename).read()
     c = c[1:] if len(c) > 0 and ord(c[0]) == 0xfeff else c
-    open(filename, 'wb').write(re.sub(r'\r', '', c))
+    open(filename, 'wb').write(re.sub(r'\r', '', c).encode('utf-8'))
 
 def win2linux_all_files_in_dir(some_dir):
     for dname, dirs, files in os.walk(some_dir):

bin/python/folder_hash.py

@@ -23,6 +23,6 @@
     lab_path = args.directory.replace('"', '').replace("'", '').replace("//", '/')
 
 if args.print_only and nc.PLATFORM == nc.WINDOWS: #linux still needs the hash for the while statement
-    print " "
+    print(" ")
 else:
-    print u.generate_urlsafe_hash(lab_path)
+    print(u.generate_urlsafe_hash(lab_path))

bin/python/lstart.py

@@ -82,7 +82,7 @@
 
 args, unknown = parser.parse_known_args()
 
-machine_name_args = filter (lambda x: not (x.startswith("--") or x.startswith("-")), unknown)
+machine_name_args = list(filter (lambda x: not (x.startswith("--") or x.startswith("-")), unknown))
 
 # applying parameter options (1/3)
 title_option = " -T "

bin/python/netkit_commons.py

@@ -1,6 +1,9 @@
-import ConfigParser
+try: 
+    import configparser as ConfigParser
+except:
+    import ConfigParser
 config = ConfigParser.ConfigParser()
-import StringIO
+from io import StringIO
 from itertools import chain
 import re
 import sys
@@ -30,8 +33,8 @@
 
 def read_config():
     tmp_config = ConfigParser.ConfigParser()
-    ini = '[dummysection]\n' + open(os.path.join(os.environ['NETKIT_HOME'], '..', 'config'), 'r').read()
-    ini_string = StringIO.StringIO(ini)
+    ini = u'[dummysection]\n' + open(os.path.join(os.environ['NETKIT_HOME'], '..', 'config'), 'r').read()
+    ini_string = StringIO(ini)
     tmp_config.readfp(ini_string)
     conf = {}
     for key, value in tmp_config.items('dummysection'): 
@@ -95,8 +98,8 @@ def lab_parse(path, force=False):
         return ({}, [], {}, {}) # has to get names from last positional args
 
     # reads lab.conf
-    ini_str = '[dummysection]\n' + open(os.path.join(path, 'lab.conf'), 'r').read()
-    ini_fp = StringIO.StringIO(ini_str)
+    ini_str = u'[dummysection]\n' + open(os.path.join(path, 'lab.conf'), 'r').read()
+    ini_fp = StringIO(ini_str)
     config.readfp(ini_fp)
 
     # gets 2 list of keys, one for machines and the other for the metadata
@@ -193,7 +196,7 @@ def create_commands(machines, links, options, metadata, path, execbash=False, no
 
     # writing the network list in the temp file
     if not execbash:
-        if not PRINT: u.write_temp(lab_links_text, u.generate_urlsafe_hash(path) + '_links', PLATFORM, file_mode="w+")
+        if not PRINT: u.write_temp(lab_links_text, str(u.generate_urlsafe_hash(path)) + '_links', PLATFORM, file_mode="w+")
 
     # generating commands for running the containers, copying the config folder and executing the terminals connected to the containers
     if PLATFORM != WINDOWS:
@@ -296,7 +299,7 @@ def create_commands(machines, links, options, metadata, path, execbash=False, no
     # writing the container list in the temp file
     if not no_machines_tmp:
         if not execbash:
-            if not PRINT: u.write_temp(lab_machines_text, u.generate_urlsafe_hash(path) + '_machines', PLATFORM)
+            if not PRINT: u.write_temp(lab_machines_text, str(u.generate_urlsafe_hash(path)) + '_machines', PLATFORM)
 
 
     # for each machine we have to get the machine.startup file and insert every non empty line as a string inside an array of exec commands. We also replace escapes and quotes

bin/python/print_metadata.py

@@ -25,8 +25,8 @@
 (_,_,_, metadata) = nc.lab_parse(lab_path)
 
 if not args.print_only: 
-    print "========================= Starting Lab =========================="
+    print("========================= Starting Lab ==========================")
     if len(metadata.items()) >= 1:
         for key, value in metadata.items():
-            print '{message: <20}'.format(message=key+":") + value
-        print "================================================================="
+            print('{message: <20}'.format(message=key+":") + value)
+        print("=================================================================")

bin/python/utils.py

@@ -2,13 +2,14 @@
 import hashlib
 import re
 import os
+import functools
 try:
     import pwd
 except ImportError: #windows
     pass
 
 def generate_urlsafe_hash(string):
-    return base64.urlsafe_b64encode(hashlib.md5(string).digest())[:-2]
+    return base64.urlsafe_b64encode(hashlib.md5(string.encode('utf-8')).digest())[:-2]
 
 # helper functions for natural sorting
 def atoi(text):
@@ -17,7 +18,7 @@ def natural_keys(text):
     return [ atoi(c) for c in re.split('(\d+)', text) ]
 
 def replace_multiple_items(repls, string):
-        return reduce(lambda a, kv: a.replace(*kv), repls, string)
+        return functools.reduce(lambda a, kv: a.replace(*kv), repls, string)
 
 # writes the temporary files in NETKIT_HOME/temp
 def write_temp(text, filename, mode="linux", file_mode="a+"):

bin/python/vstart.py

@@ -249,4 +249,4 @@ def lstart_command_writer():
 else:
     start_new_machine()
 
-print lstart_command_writer()
+print(lstart_command_writer())