Port to Python 3

Makefile.am

@@ -28,4 +28,4 @@ lint:
 
 test: lint check-po
 	PYTHONPATH=$(pkgdatadir)/extensions:$(PYTHONPATH) \
-	python -m sugar3.test.discover $(top_srcdir)/tests
+	python3 -m sugar3.test.discover $(top_srcdir)/tests

bin/sugar-backlight-setup

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 
 # Copyright (C) 2015 Martin Abente Lahaye <tch@sugarlabs.org>
 #
@@ -60,7 +60,7 @@ def _main():
     try:
         SugarBacklightSetup()
     except Exception as err:
-        print 'Could not create device link: %s' % str(err)
+        print('Could not create device link: %s' % str(err))
         sys.exit(1)
 
 if __name__ == '__main__':

bin/sugar-control-panel

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 # Copyright (C) 2008, Red Hat, Inc.
 #
 # This program is free software: you can redistribute it and/or modify

bin/sugar-erase-bundle

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 import os
 import sys
 
@@ -8,8 +8,8 @@ DBusGMainLoop(set_as_default=True)
 from jarabe.model import bundleregistry
 
 def cmd_help():
-    print 'Usage: sugar-erase-bundle bundle_id [...] \n\n\
-    Erase activity bundles\n'
+    print('Usage: sugar-erase-bundle bundle_id [...] \n\n\
+    Erase activity bundles\n')
 
 if len(sys.argv) < 2:
     cmd_help()
@@ -19,7 +19,7 @@ for name in sys.argv[1:]:
     registry = bundleregistry.get_registry()
     bundle = registry.get_bundle(name)
     if not bundle:
-        print 'Cannot find %s bundle.' % name
+        print('Cannot find %s bundle.' % name)
         continue
 
     registry.uninstall(bundle, delete_profile=True)

bin/sugar-install-bundle

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 import os
 import sys
 
@@ -9,8 +9,8 @@ DBusGMainLoop(set_as_default=True)
 
 
 def cmd_help():
-    print 'Usage: sugar-install-bundle activitybundle.xo [...] \n\n\
-    Install activity bundles\n'
+    print('Usage: sugar-install-bundle activitybundle.xo [...] \n\n\
+    Install activity bundles\n')
 
 if len(sys.argv) < 2:
     cmd_help()
@@ -24,4 +24,4 @@ for name in sys.argv[1:]:
     # by triggering a GFileMonitor ATTRIBUTE_CHANGED event.
     os.utime(path, None)
 
-    print "%s: '%s' installed." % (sys.argv[0], name)
+    print("%s: '%s' installed." % (sys.argv[0], name))

bin/sugar-launch

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 
 # Copyright (C) 2007, Red Hat, Inc.
 #
@@ -35,12 +35,12 @@ parser.add_argument("-u", "--uri",
                     help='URI to load')
 
 args = parser.parse_args()
-print args.bundle_id
+print(args.bundle_id)
 bus = dbus.SessionBus()
 proxy = bus.get_object('org.laptop.Shell', '/org/laptop/Shell')
 path = dbus.Interface(proxy, 'org.laptop.Shell').GetBundlePath(args.bundle_id)
 if not path:
-    print 'Cannot find %s bundle.' % args.bundle_id
+    print('Cannot find %s bundle.' % args.bundle_id)
     sys.exit(1)
 
 activity = ActivityBundle(path)

bin/sugar.in

@@ -80,4 +80,4 @@ cat > "$debug_file_path" << EOF
 EOF
 fi
 
-exec python2 -m jarabe.main
+exec python3 -m jarabe.main

configure.ac

@@ -12,7 +12,7 @@ AM_INIT_AUTOMAKE([1.9 foreign dist-xz no-dist-gzip])
 
 AM_MAINTAINER_MODE
 
-PYTHON=python2
+PYTHON=python3
 AM_PATH_PYTHON
 
 PKG_CHECK_MODULES(SHELL, gtk+-3.0)

data/Makefile.am

@@ -1,11 +1,11 @@
 SUBDIRS = icons
 
 sugar-72.gtkrc: gtkrc.em
-	$(srcdir)/em.py -D scaling=\'72\' $(srcdir)/gtkrc.em > \
+	empy3 -D scaling=\'72\' $(srcdir)/gtkrc.em > \
 		$(top_builddir)/data/sugar-72.gtkrc
 
 sugar-100.gtkrc: gtkrc.em
-	$(srcdir)/em.py -D scaling=\'100\' $(srcdir)/gtkrc.em > \
+	empy3 -D scaling=\'100\' $(srcdir)/gtkrc.em > \
 		$(top_builddir)/data/sugar-100.gtkrc
 
 sugardir = $(pkgdatadir)/data
@@ -60,5 +60,5 @@ polkit_policydir = $(datadir)/polkit-1/actions
 polkit_in_files = org.sugar.brightness.policy.in org.sugar.serial-number.policy.in
 polkit_policy_DATA = $(polkit_in_files:.policy.in=.policy)
 
-EXTRA_DIST = $(sugar_DATA) $(xsessions_DATA) $(nmservice_DATA) $(mime_xml_in_files) em.py gtkrc.em $(icon_DATA) $(gsettings_SCHEMAS) $(convert_DATA) $(polkit_in_files)
+EXTRA_DIST = $(sugar_DATA) $(xsessions_DATA) $(nmservice_DATA) $(mime_xml_in_files) gtkrc.em $(icon_DATA) $(gsettings_SCHEMAS) $(convert_DATA) $(polkit_in_files)
 CLEANFILES = $(GTKRC_FILES) $(mime_xml_files) $(polkit_policy_DATA)