diff --git a/activity/activity.info b/activity/activity.info index 66fe9f1..05e59e5 100644 --- a/activity/activity.info +++ b/activity/activity.info @@ -2,7 +2,7 @@ name = Panorama activity_version = 9 bundle_id = org.laptop.PanoramaActivity -exec = sugar-activity activity.PanoramaActivity +exec = sugar-activity3 activity.PanoramaActivity icon = activity-panorama show_launcher = yes license = GPLv3+ diff --git a/pano.py b/pano.py index 98289f7..c933e5b 100755 --- a/pano.py +++ b/pano.py @@ -33,7 +33,7 @@ from pygame.locals import * from pygame import camera except ImportError: - print 'Error in import Pygame. This activity requires Pygame 1.9' + print('Error in import Pygame. This activity requires Pygame 1.9') class PanoCapture(): diff --git a/sugargame/canvas.py b/sugargame/canvas.py index 2299f4d..d783f8a 100755 --- a/sugargame/canvas.py +++ b/sugargame/canvas.py @@ -4,7 +4,7 @@ from gi.repository import GLib from sugar3.activity.activity import PREVIEW_SIZE import pygame -import event +from . import event CANVAS = None diff --git a/sugargame/event.py b/sugargame/event.py index dee8d78..d20f9a2 100755 --- a/sugargame/event.py +++ b/sugargame/event.py @@ -139,7 +139,7 @@ def _keyup_cb(self, widget, event): def _keymods(self): mod = 0 - for key_val, mod_val in self.mod_map.iteritems(): + for key_val, mod_val in self.mod_map.items(): mod |= self.__keystate[key_val] and mod_val return mod @@ -168,10 +168,10 @@ def _keyevent(self, widget, event, type): self.__keystate[keycode] = type == pygame.KEYDOWN if type == pygame.KEYUP: mod = self._keymods() - ukey = unichr(Gdk.keyval_to_unicode(event.keyval)) + ukey = chr(Gdk.keyval_to_unicode(event.keyval)) if ukey == '\000': ukey = '' - evt = pygame.event.Event(type, key=keycode, unicode=ukey, mod=mod) + evt = pygame.event.Event(type, key=keycode, str=ukey, mod=mod) self._post(evt) return True @@ -248,7 +248,7 @@ def _get_mouse_pos(self): def _post(self, evt): try: pygame.event.post(evt) - except pygame.error, e: + except pygame.error as e: if str(e) == 'video system not initialized': pass elif str(e) == 'Event queue full':