initial 2to3 compat changes

4 files changed, 8 insertions, 8 deletions

diff --git a/bin/vmdebootstrap b/bin/vmdebootstrap
index af9b0f6..dc76693 100755
--- a/bin/vmdebootstrap
+++ b/bin/vmdebootstrap
@@ -135,7 +135,7 @@ class VmDebootstrap(cliapp.Application):  # pylint: disable=too-many-public-meth
 
     def process_args(self, args):  # pylint: disable=too-many-branches,too-many-statements
 
-        for _, handler in self.handlers.items():
+        for _, handler in list(self.handlers.items()):
             handler.define_settings(self.settings)
 
         distro = self.handlers[Codenames.name]
@@ -180,7 +180,7 @@ class VmDebootstrap(cliapp.Application):  # pylint: disable=too-many-public-meth
         self.include = self._bootstrap_packages()
 
         if self.settings['dry-run']:
-            print "Selected packages: ", ', '.join(self.include)
+            print("Selected packages: ", ', '.join(self.include))
             sys.exit(0)
         if os.geteuid() != 0:
             sys.exit("You need to have root privileges to run this script.")
diff --git a/doc/conf.py b/doc/conf.py
index 5f3056c..c1d6dc7 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -47,8 +47,8 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'vmdebootstrap'
-copyright = u'2015 Neil Williams'
+project = 'vmdebootstrap'
+copyright = '2015 Neil Williams'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -187,8 +187,8 @@ htmlhelp_basename = 'vmdebootstrapdocs'
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-    ('index', 'vmdebootstrap.tex', u'vmdebootstrap',
-     u'Neil Williams', 'manual'),
+    ('index', 'vmdebootstrap.tex', 'vmdebootstrap',
+     'Neil Williams', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
diff --git a/vmdebootstrap/base.py b/vmdebootstrap/base.py
index b68f463..7a71641 100644
--- a/vmdebootstrap/base.py
+++ b/vmdebootstrap/base.py
@@ -101,7 +101,7 @@ class Base(object):
     def message(self, msg):
         logging.info(msg)
         if self.settings['verbose']:
-            print msg
+            print(msg)
 
     def create_empty_image(self):
         self.message('Creating disk image')
diff --git a/vmextract.py b/vmextract.py
index 563d0c3..966a8bb 100755
--- a/vmextract.py
+++ b/vmextract.py
@@ -91,7 +91,7 @@ class VmExtract(cliapp.Application):  # pylint: disable=too-many-public-methods
     def message(self, msg):
         logging.info(msg)
         if self.settings['verbose']:
-            print msg
+            print(msg)
 
     def prepare(self):
         """