Port from Python 2 to six

Signed-off-by: James Cameron <quozl@laptop.org>

tests/data/sample.activity/activity/activity.info

@@ -2,6 +2,6 @@
 name = Sample
 activity_version = 1
 bundle_id = org.sugarlabs.Sample
-exec = sugar-activity activity.SampleActivity
+exec = sugar-activity3 activity.SampleActivity
 icon = activity-sample
 license = GPLv2+

tests/data/sample.activity/setup.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 
 from sugar3.activity import bundlebuilder
 

tests/graphics/progressicon.py

@@ -59,6 +59,7 @@ def timeout_cb():
         return False
     return True
 
+
 GLib.timeout_add(50, timeout_cb)
 
 if __name__ == '__main__':

tests/test_mime.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 
 # Copyright (C) 2006, Red Hat, Inc.
 # Copyright (C) 2007, One Laptop Per Child

tests/test_uitree.py

@@ -23,7 +23,7 @@ from sugar3.test import uitree
 
 class TestUITree(unittest.TestCase):
     def test_tree(self):
-        process = subprocess.Popen(["python", __file__, "show_window1"])
+        process = subprocess.Popen(["python3", __file__, "show_window1"])
 
         try:
             root = uitree.get_root()
@@ -49,5 +49,6 @@ def show_window1():
 
     Gtk.main()
 
+
 if __name__ == '__main__':
     globals()[sys.argv[1]]()