port to python 3

Author: Devmoni

SliderPuzzleActivity.py

@@ -38,7 +38,7 @@
 import logging
 import os
 import sys
-import md5
+import hashlib
 
 logger = logging.getLogger('sliderpuzzle-activity')
 
@@ -48,11 +48,11 @@
 # game tube
 import zlib
 import time
-from cStringIO import StringIO
+from io import StringIO
 
 from dbus import Interface, DBusException
 from dbus.service import method, signal
-from dbus.gobject_service import ExportedGObject
+from dbus.service import Object as ExportedGObject
 
 from mamamedia_modules import GAME_IDLE, GAME_STARTED, GAME_FINISHED, GAME_QUIT
 import logging
@@ -226,7 +226,7 @@ def sync(self, *args):
         if self._lock:
             return
         logger.debug("sync'ing game state")
-        self.frozen = json.write(self.slider_ui._freeze(journal=False))
+        self.frozen = json.dumps(self.slider_ui._freeze(journal=False))
 
     def apply(self):
         """ Apply the saved state to the running game """
@@ -373,7 +373,7 @@ def read_file(self, file_path):
         self.ui._thaw(json.read(session_data))
 
     def write_file(self, file_path):
-        session_data = json.write(self.ui._freeze())
+        session_data = json.dumps(self.ui._freeze())
         f = open(file_path, 'w')
         try:
             f.write(session_data)

SliderPuzzleUI.py

@@ -38,7 +38,7 @@
 from SliderPuzzleWidget import SliderPuzzleWidget
 from time import time
 import os
-import md5
+import hashlib
 from sugar3.activity.activity import get_bundle_path
 from sugar3 import mime
 from sugar3.graphics.objectchooser import ObjectChooser
@@ -491,11 +491,11 @@ def _thaw(self, obj):
         if not obj[1]['image']:
             return
 
-        if not obj[1].has_key('image'):
+        if 'image' not in obj[1]:
             self.game.load_image(self.pbb)
         self.set_nr_pieces(None, obj[2])
-        logging.debug(obj[1].keys())
-        wimg = obj[1].has_key('image')
+        logging.debug(list(obj[1].keys()))
+        wimg = 'image' in obj[1]
         self.game._thaw(obj[1])
         if wimg:
             logging.debug("Forcing thumb image from the one in game")

SliderPuzzleWidget.py

@@ -19,18 +19,19 @@
 #
 
 from gi.repository import Gtk, GObject, Pango, GdkPixbuf, Gdk
-import md5
+import hashlib
 import logging
 import tempfile
 from mamamedia_modules import utils
 
 #from utils import load_image, calculate_matrix, debug, SliderCreator, trace
 
-from types import TupleType, ListType
+TupleType = tuple
+ListType = list
 from random import random
 from time import time
 from math import sqrt
-from cStringIO import StringIO
+from io import StringIO
 import os
 
 ###
@@ -113,7 +114,7 @@ def prepare_stringed(self, rows, cols):
                 # if c > 0 and r > 0:
                 #    pm.draw_line(gc, px, 0, px, self.height-1)
                 #    pm.draw_line(gc, 0, py, self.width-1, py)
-                pangolayout.set_text(str(item.next()))
+                pangolayout.set_text(str(next(item)))
                 pe = pangolayout.get_pixel_extents()
                 pe = pe[1][2] / 2, pe[1][3] / 2
                 pm.draw_layout(gc, px + (sw / 2) -
@@ -194,7 +195,7 @@ def __init__(self, pieces=9, move_cb=None):
 
     def reset(self, pieces=9):
         self.pieces, self.rowsize, self.colsize = calculate_matrix(pieces)
-        pieces_map = range(1, self.pieces + 1)
+        pieces_map = list(range(1, self.pieces + 1))
         self.pieces_map = []
         for i in range(self.rowsize):
             self.pieces_map.append(
@@ -399,7 +400,7 @@ def _freeze(self):
                 'pieces_map': self.pieces_map, 'hole_pos_freeze': self.hole_pos._freeze()}
 
     def _thaw(self, obj):
-        for k in obj.keys():
+        for k in list(obj.keys()):
             if hasattr(self, k):
                 setattr(self, k, obj[k])
         self.hole_pos._thaw(obj.get('hole_pos_freeze', None))
@@ -605,7 +606,7 @@ def _thaw(self, obj):
         """ retrieves a frozen status from a python object, as per _freeze """
         logging.debug(obj['jumbler'])
         self.jumbler._thaw(obj['jumbler'])
-        if obj.has_key('image') and obj['image'] is not None:
+        if 'image' in obj and obj['image'] is not None:
             self.set_image_from_str(obj['image'])
             del obj['image']
         self.full_refresh()

activity/activity.info

@@ -1,7 +1,7 @@
 [Activity]
 name = Slider Puzzle
 bundle_id = org.worldwideworkshop.olpc.SliderPuzzle
-exec = sugar-activity SliderPuzzleActivity.SliderPuzzleActivity
+exec = sugar-activity3 SliderPuzzleActivity.SliderPuzzleActivity
 icon = activity-sliderpuzzle
 activity_version = 10
 show_launcher = yes

mmm_modules/__init__.py

@@ -1,9 +1,9 @@
-from borderframe import *
-from timer import *
-from image_category import *
-from i18n import *
+from .borderframe import *
+from .timer import *
+from .image_category import *
+from .i18n import *
 #from notebook_reader import *
-from buddy_panel import *
-from tube_helper import *
-import utils
+from .buddy_panel import *
+from .tube_helper import *
+from .utils import *  
 import json

mmm_modules/buddy_panel.py

@@ -24,7 +24,7 @@
 
 import logging
 
-from tube_helper import GAME_IDLE, GAME_STARTED, GAME_FINISHED, GAME_QUIT
+from .tube_helper import GAME_IDLE, GAME_STARTED, GAME_FINISHED, GAME_QUIT
 
 #from sugar.graphics.icon import CanvasIcon
 

mmm_modules/image_category.py

@@ -25,10 +25,10 @@
 import os
 from glob import glob
 import logging
-import md5
+import hashlib
 from sugar3.activity.activity import Activity, get_bundle_path
-from utils import load_image, resize_image, RESIZE_CUT
-from borderframe import BorderFrame
+from .utils import load_image, resize_image, RESIZE_CUT
+from .borderframe import BorderFrame
 from gettext import gettext as _
 
 THUMB_SIZE = 48

mmm_modules/timer.py

@@ -44,7 +44,7 @@
         mmmpath = cwd
     iconpath = os.path.join(mmmpath, 'icons')
 
-from utils import load_image
+from .utils import load_image
 
 
 class TimerWidget (Gtk.HBox):

mmm_modules/utils.py

@@ -162,6 +162,6 @@ def resize_image(pb, width=-1, height=-1, method=RESIZE_CUT):
 
 def trace(func):
     def wrapped(*args, **kwargs):
-        logging.debug("TRACE %s %s %s" % (func.func_name, args, kwargs))
+        logging.debug("TRACE %s %s %s" % (func.__name__, args, kwargs))
         return func(*args, **kwargs)
     return wrapped

setup.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # Copyright (C) 2006, Red Hat, Inc.
 #