@@ -1,4 +1,3 @@

-#! /usr/bin/python2

 #

 #    Copyright (C) 2015 vmware inc.

 #

@@ -9,10 +8,6 @@ class Action(object):

     def do_action(self, params):

         raise NameError('Abstract method, this should be implemented in the child class')

-    

+

     def hide(self, params):

         raise NameError('Abstract method, this should be implemented in the child class')

-

-

-    

-    

\ No newline at end of file

@@ -1,4 +1,3 @@

-#! /usr/bin/python2

 #

 #    Copyright (C) 2015 vmware inc.

 #

@@ -10,5 +9,3 @@ class ActionResult(object):

     def __init__(self, success, result):

         self.success = success

         self.result = result

-

-    

\ No newline at end of file

@@ -1,4 +1,3 @@

-#!/usr/bin/python2

 #

 #    Copyright (C) 2015 vmware inc.

 #

@@ -1,4 +1,3 @@

-#! /usr/bin/python2

 #

 #    Copyright (C) 2015 vmware inc.

 #

@@ -19,7 +19,6 @@ from jsonwrapper import JsonWrapper

 from progressbar import ProgressBar

 from window import Window

 from actionresult import ActionResult

-from __builtin__ import isinstance

 class Installer(object):

     def __init__(self, install_config, maxy = 0, maxx = 0, iso_installer = False,

@@ -57,10 +56,10 @@ class Installer(object):

             self.progress_padding = 5

             self.progress_width = self.width - self.progress_padding

-            self.starty = (self.maxy - self.height) / 2

-            self.startx = (self.maxx - self.width) / 2

+            self.starty = (self.maxy - self.height) // 2

+            self.startx = (self.maxx - self.width) // 2

             self.window = Window(self.height, self.width, self.maxy, self.maxx, 'Installing Photon', False, items =[])

-            self.progress_bar = ProgressBar(self.starty + 3, self.startx + self.progress_padding / 2, self.progress_width)

+            self.progress_bar = ProgressBar(self.starty + 3, self.startx + self.progress_padding // 2, self.progress_width)

         signal.signal(signal.SIGINT, self.exit_gracefully)

@@ -152,6 +151,7 @@ class Installer(object):

                         if output.startswith(prefix):

                             package = output[len(prefix):].rstrip('\n')

                             self.progress_bar.increment(packages_to_install[package])

+

                         self.progress_bar.update_message(output)

                 # 0 : succeed; 137 : package already installed; 65 : package not found in repo.

                 if retval != 0 and retval != 137:

@@ -1,4 +1,3 @@

-#! /usr/bin/python2

 #

 #    Copyright (C) 2015 vmware inc.

 #

@@ -109,7 +109,7 @@ class IsoInstaller(object):

     def validate_password(text):

         try:

             p = cracklib.VeryFascistCheck(text)

-        except ValueError, message:

+        except ValueError as message:

             p = str(message)

         return p == text, "Error: " + p

@@ -1,4 +1,3 @@

-#!/usr/bin/python2

 #

 #    Copyright (C) 2015 vmware inc.

 #

@@ -1,4 +1,3 @@

-#! /usr/bin/python2

 #

 #    Copyright (C) 2015 vmware inc.

 #

@@ -15,8 +14,8 @@ class License(object):

         self.win_width = maxx - 4

         self.win_height = maxy - 4

-        self.win_starty = (self.maxy - self.win_height) / 2

-        self.win_startx = (self.maxx - self.win_width) / 2

+        self.win_starty = (self.maxy - self.win_height) // 2

+        self.win_startx = (self.maxx - self.win_width) // 2

         self.text_starty = self.win_starty + 4

         self.text_height = self.win_height - 6

@@ -31,7 +30,7 @@ class License(object):

                                 ]

         title = 'VMWARE 2.0 LICENSE AGREEMENT'

-        self.window.addstr(0, (self.win_width - len(title)) / 2, title)

+        self.window.addstr(0, (self.win_width - len(title)) // 2, title)

         self.text_pane = TextPane(self.text_starty, self.maxx, self.text_width, "EULA.txt", self.text_height, accept_decline_items)

         self.window.set_action_panel(self.text_pane)

@@ -44,6 +43,3 @@ class License(object):

     def exit_function(self):

         exit(0)

-

-

-

@@ -1,4 +1,3 @@

-#! /usr/bin/python2

 #

 #    Copyright (C) 2015 vmware inc.

 #

@@ -7,7 +6,6 @@

 import curses

 from actionresult import ActionResult

 from action import Action

-from sets import Set

 class Menu(Action):

     def __init__(self, starty, maxx, items, height = 0, selector_menu = False, can_navigate_outside = True, horizontal = False, default_selected = 0, save_sel = False, tab_enable = True):

@@ -46,7 +44,7 @@ class Menu(Action):

         self.selector_menu = selector_menu

         if self.selector_menu:

             self.width += 4

-            self.selected_items = Set([])

+            self.selected_items = set([])

         if self.horizontal:

             menu_win_width = (self.width + self.horizontal_padding) * self.num_items

@@ -59,7 +57,7 @@ class Menu(Action):

         self.window.keypad(1)

         self.panel = curses.panel.new_panel(self.window)

-        self.panel.move(starty, (maxx - menu_win_width) / 2)

+        self.panel.move(starty, (maxx - menu_win_width) // 2)

         self.panel.hide()

         curses.panel.update_panels()

@@ -142,7 +140,7 @@ class Menu(Action):

                 else:

                     item = '[ ] ' + item

             if self.horizontal:

-                x = self.horizontal_padding / 2 + index * self.horizontal_padding

+                x = self.horizontal_padding // 2 + index * self.horizontal_padding

                 y = 0

             else:

                 x = 0

@@ -38,7 +38,7 @@ def partition_disk(disk, partitions):

     output = open(os.devnull, 'w')

     # Clear the disk

-    process = subprocess.Popen(['sgdisk', '-o', '-g', disk], stdout = output)

+    process = subprocess.Popen(['sgdisk', '-o', '-g', disk], stderr = output, stdout = output)

     retval = process.wait()

     if retval != 0:

         log(LOG_ERROR, "Failed clearing disk {0}".format(disk))

@@ -72,23 +72,23 @@ def partition_disk(disk, partitions):

         prefix = ''

         if 'nvme' in disk:

             prefix = 'p'

-        partition['path'] = disk + prefix + `partition_number`

+        partition['path'] = disk + prefix + repr(partition_number)

         partition_number = partition_number + 1

     # Adding the last extendible partition

     if extensible_partition:

-        partition_cmd.extend(['-n', `extensible_partition['partition_number']`])

+        partition_cmd.extend(['-n', repr(extensible_partition['partition_number'])])

     partition_cmd.extend(['-p', disk])

     # Run the partitioning command

-    process = subprocess.Popen(partition_cmd, stdout = output)

+    process = subprocess.Popen(partition_cmd, stderr = output, stdout = output)

     retval = process.wait()

     if retval != 0:

         log(LOG_ERROR, "Faild partition disk, command: {0}". format(partition_cmd))

         return None

-    process = subprocess.Popen(['sgdisk', '-t1' + grub_flag, disk], stdout = output)

+    process = subprocess.Popen(['sgdisk', '-t1' + grub_flag, disk], stderr = output, stdout = output)

     retval = process.wait()

     if retval != 0:

         log(LOG_ERROR, "Failed to setup grub partition")

@@ -105,13 +105,14 @@ def partition_disk(disk, partitions):

                 partitions_data['boot_partition_number'] = partition['partition_number']

                 partitions_data['bootdirectory'] = '/'

         if partition['filesystem'] == "swap":

-            process = subprocess.Popen(['mkswap', partition['path']], stdout = output)

+            process = subprocess.Popen(['mkswap', partition['path']], stderr = output, stdout = output)

             retval = process.wait()

             if retval != 0:

                 log(LOG_ERROR, "Failed to create swap partition @ {}".format(partition['path']))

                 return None

         else:

-            process = subprocess.Popen(['mkfs', '-t', partition['filesystem'], partition['path']], stdout = output)

+            mkfs_cmd = ['mkfs', '-t', partition['filesystem'], partition['path']]

+            process = subprocess.Popen(mkfs_cmd, stderr = output, stdout = output)

             retval = process.wait()

             if retval != 0:

                 log(LOG_ERROR, "Failed to format {} partition @ {}".format(partition['filesystem'], partition['path']))

@@ -137,7 +138,7 @@ def replace_string_in_file(filename,  search_string,  replace_string):

     with open(filename, "w") as destination:

         for line in lines:

-            destination.write(re.sub(search_string,  replace_string,  line))

+            destination.write(re.sub(search_string, replace_string, line))

 def log(type, message):

     command = 'systemd-cat echo \"<{}> {} : {}\"'.format(type, LOG_LEVEL_DESC[type], message)

@@ -16,7 +16,7 @@ def execute(name, config, root):

     with open(script_file,  'wb') as outfile:

         outfile.write("\n".join(script))

-    os.chmod(script_file, 0700);

+    os.chmod(script_file, 0o700);

     with open(commons.KS_POST_INSTALL_LOG_FILE_NAME,"w") as logfile:

         process = subprocess.Popen(["./mk-run-chroot.sh", '-w', root, "/etc/tmpfiles.d/postinstall.sh"],

             stdout=logfile,stderr=logfile)

@@ -9,9 +9,9 @@ def execute(name, config, root):

     hostname = config['hostname']

     hostname_file = os.path.join(root, 'etc/hostname')

-    hosts_file = os.path.join(root, 'etc/hosts')

+    hosts_file    = os.path.join(root, 'etc/hosts')

-    with open(hostname_file,  'wb') as outfile:

+    with open(hostname_file, 'wb') as outfile:

         outfile.write(hostname)

     commons.replace_string_in_file(hosts_file, r'127\.0\.0\.1\s+localhost\s*\Z', '127.0.0.1\tlocalhost\n127.0.0.1\t' + hostname)

@@ -18,7 +18,7 @@ def execute(name, config, root):

         os.makedirs(authorized_keys_dir)

     with open(authorized_keys_filename, "a") as destination:

         destination.write(config['public_key'] + "\n")

-    os.chmod(authorized_keys_filename, 0600)

+    os.chmod(authorized_keys_filename, 0o600)

     # Change the sshd config to allow root login

     process = subprocess.Popen(["sed", "-i", "s/^\\s*PermitRootLogin\s\+no/PermitRootLogin yes/", sshd_config_filename])

@@ -1,4 +1,3 @@

-#!/usr/bin/python2

 #

 #    Copyright (C) 2015 vmware inc.

 #

@@ -1,4 +1,3 @@

-#!/usr/bin/python2

 #

 #    Copyright (C) 2015 vmware inc.

 #

@@ -1,4 +1,3 @@

-#!/usr/bin/python2

 #

 #    Copyright (C) 2015 vmware inc.

 #

@@ -7,7 +6,6 @@

 import json

 import os

 import curses

-from sets import Set

 from jsonwrapper import JsonWrapper

 from menu import Menu

 from window import Window

@@ -21,8 +19,8 @@ class PackageSelector(object):

         self.win_width = 50

         self.win_height = 13

-        self.win_starty = (self.maxy - self.win_height) / 2

-        self.win_startx = (self.maxx - self.win_width) / 2

+        self.win_starty = (self.maxy - self.win_height) // 2

+        self.win_startx = (self.maxx - self.win_width) // 2

         self.menu_starty = self.win_starty + 3

@@ -50,7 +48,7 @@ class PackageSelector(object):

         additional_files = []

         for install_option in options:

             if install_option[0] == config_type:

-                if install_option[1].has_key("additional-files"):

+                if "additional-files" in install_option[1]:

                     additional_files = install_option[1]["additional-files"]

                 break

         return additional_files

@@ -112,7 +112,7 @@ def create_additional_file_list_to_copy_in_iso(base_path, build_install_option):

     options_sorted = option_list_json.items()

     file_list = []

     for install_option in options_sorted:

-        if install_option[1].has_key("additional-files"):

+        if "additional-files" in install_option[1]:

             file_list = file_list + map(lambda filename: os.path.join(base_path, filename), install_option[1].get("additional-files"))

     return file_list

@@ -122,7 +122,7 @@ def get_live_cd_status_string(build_install_option):

     options_sorted = option_list_json.items()

     file_list = []

     for install_option in options_sorted:

-        if install_option[1].has_key("live-cd"):

+        if "live-cd" in install_option[1]:

             if install_option[1].get("live-cd") == True:

                 return "true"

     return "false"

@@ -212,7 +212,7 @@ if __name__ == '__main__':

             config = (JsonWrapper(options.configfile)).read()

             config['disk'], success = create_vmdk_and_partition(config, options.vmdk_path)

             if not success:

-                print "Unexpected failure, please check the logs"

+                print("Unexpected failure, please check the logs")

                 sys.exit(1)

             config['iso_system'] = False

@@ -1,4 +1,3 @@

-#! /usr/bin/python2

 #

 #    Copyright (C) 2015 vmware inc.

 #

@@ -85,8 +84,8 @@ class ProgressBar(object):

     def render_progress(self):

         if self.num_items == 0:

             return

-        completed = self.progress * 100 / self.num_items

-        completed_width = completed * self.width / 100

+        completed = self.progress * 100 // self.num_items

+        completed_width = completed * self.width // 100

         completed_str, remaining_str = self.get_spaces(completed_width, self.width, completed)

         self.window.addstr(0, 0, completed_str, curses.color_pair(3))

@@ -162,7 +161,7 @@ class ProgressBar(object):

     def get_spaces(self, completed_width, total_width, per):

         per = str(per) + '%'

-        start = (total_width + 2 - len(per)) / 2

+        start = (total_width + 2 - len(per)) // 2

         end = start + len(per)

         index = 0

@@ -1,4 +1,3 @@

-#! /usr/bin/python2

 #

 #    Copyright (C) 2015 vmware inc.

 #

@@ -1,4 +1,3 @@

-#! /usr/bin/python2

 #

 #    Copyright (C) 2015 vmware inc.

 #

@@ -1,4 +1,3 @@

-#! /usr/bin/python2

 #

 #    Copyright (C) 2015 vmware inc.

 #

@@ -22,14 +21,14 @@ class SelectDisk(object):

         self.win_width = 70

         self.win_height = 16

-        self.win_starty = (self.maxy - self.win_height) / 2

-        self.win_startx = (self.maxx - self.win_width) / 2

+        self.win_starty = (self.maxy - self.win_height) // 2

+        self.win_startx = (self.maxx - self.win_width) // 2

         self.menu_starty = self.win_starty + 6

         self.menu_height = 5

         self.progress_padding = 5

         self.progress_width = self.win_width - self.progress_padding

-        self.progress_bar = ProgressBar(self.win_starty + 6, self.win_startx + self.progress_padding / 2, self.progress_width, new_win=True)

+        self.progress_bar = ProgressBar(self.win_starty + 6, self.win_startx + (self.progress_padding // 2), self.progress_width, new_win=True)

         self.disk_buttom_items = []

         self.disk_buttom_items.append(('<Custom>', self.custom_function, False))

@@ -47,7 +46,7 @@ class SelectDisk(object):

         menu_height = 9

         menu_width = 40

-        menu_starty = (self.maxy - menu_height) / 2 + 5

+        menu_starty = (self.maxy - menu_height) // 2 + 5

         self.install_config['delete_partition'] = True

         confrim_window = ConfirmWindow(menu_height, menu_width, self.maxy, self.maxx, menu_starty, 'This will erase the disk.\nAre you sure?')

         confirmed = confrim_window.do_action().result['yes']

@@ -57,7 +57,7 @@ class TextPane(Action):

         self.window.keypad(1)

         self.panel = curses.panel.new_panel(self.window)

-        self.panel.move(starty, (maxx - self.width) / 2)

+        self.panel.move(starty, (maxx - self.width) // 2)

         self.panel.hide()

         curses.panel.update_panels()

@@ -1,4 +1,3 @@

-#!/usr/bin/python2

 #

 #    Copyright (C) 2015 vmware inc.

 #

@@ -15,8 +14,8 @@ class Window(Action):

         self.can_go_next = can_go_next

         self.height = height

         self.width = width;

-        self.y = (maxy - height) / 2

-        self.x = (maxx - width ) / 2

+        self.y = (maxy - height) // 2

+        self.x = (maxx - width ) // 2

         title = ' ' + title + ' '

         self.contentwin = curses.newwin(height - 1, width -1)

@@ -29,7 +28,7 @@ class Window(Action):

         self.position = position

         self.items = items

         self.menu_helper = menu_helper

-        self.contentwin.addstr(0, (width - 1 - len(title)) / 2 , title)#

+        self.contentwin.addstr(0, (width - 1 - len(title)) // 2 , title)#

         newy = 5;

         if self.can_go_back:

@@ -48,7 +47,7 @@ class Window(Action):

             for item in self.items:

                 self.dist-=len(item[0])

                 count+=1

-            self.dist=self.dist/count

+            self.dist=self.dist//count

             self.contentwin.keypad(1)

             newy += len('<Go Back>')

             newy += self.dist

@@ -1,4 +1,3 @@

-#!/usr/bin/python2

 #

 #    Copyright (C) 2015 vmware inc.

 #