Update mmm_modules for python 3

Author: Devmoni

mamamedia_modules.py

@@ -20,6 +20,8 @@
 
 import os
 import sys
+import gi
+gi.require_version('Gtk', '3.0')
 
 cwd = os.path.split(__file__)[0]
 

mmm_modules/__init__.py

@@ -6,4 +6,4 @@
 from .buddy_panel import *
 from .tube_helper import *
 from .utils import *  
-import json
+from . import json

mmm_modules/borderframe.py

@@ -17,7 +17,8 @@
 # If you find this activity useful or end up using parts of it in one of your
 # own creations we would love to hear from you at [email protected] !
 #
-
+import gi
+gi.require_version('Gtk', '3.0')
 from gi.repository import Gtk, GObject, Gdk
 
 BORDER_LEFT = 1

mmm_modules/i18n.py

@@ -24,7 +24,8 @@
 import os
 import gettext
 import locale
-
+import gi
+gi.require_version('Gtk', '3.0')
 from gi.repository import Gtk
 from gi.repository import GObject
 
@@ -166,11 +167,11 @@ def install(self, *args):
 
 def gather_other_translations():
     from glob import glob
-    lessons = filter(lambda x: os.path.isdir(x), glob('lessons/*'))
-    lessons = map(lambda x: os.path.basename(x), lessons)
-    lessons = map(lambda x: x[0].isdigit() and x[1:] or x, lessons)
-    images = filter(lambda x: os.path.isdir(x), glob('images/*'))
-    images = map(lambda x: os.path.basename(x), images)
+    lessons = [x for x in glob('lessons/*') if os.path.isdir(x)]
+    lessons = [os.path.basename(x) for x in lessons]
+    lessons = [x[0].isdigit() and x[1:] or x for x in lessons]
+    images = [x for x in glob('images/*') if os.path.isdir(x)]
+    images = [os.path.basename(x) for x in images]
     f = file('i18n_misc_strings.py', 'w')
     for e in images + lessons:
         f.write('_("%s")\n' % e)

mmm_modules/json.py

@@ -21,23 +21,23 @@
 
 
 class _StringGenerator(object):
-	def __init__(self, string):
-		self.string = string
-		self.index = -1
-	def peek(self):
-		i = self.index + 1
-		if i < len(self.string):
-			return self.string[i]
-		else:
-			return None
-	def next(self):
-		self.index += 1
-		if self.index < len(self.string):
-			return self.string[self.index]
-		else:
-			raise StopIteration
-	def all(self):
-		return self.string
+    def __init__(self, string):
+        self.string = string
+        self.index = -1
+    def peek(self):
+        i = self.index + 1
+        if i < len(self.string):
+            return self.string[i]
+        else:
+            return None
+    def __next__(self):
+        self.index += 1
+        if self.index < len(self.string):
+            return self.string[self.index]
+        else:
+            raise StopIteration
+    def all(self):
+        return self.string
 
 class WriteException(Exception):
     pass
@@ -58,7 +58,7 @@ def _read(self):
         self._eatWhitespace()
         peek = self._peek()
         if peek is None:
-            raise ReadException, "Nothing to read: '%s'" % self._generator.all()
+            raise ReadException("Nothing to read: '%s'" % self._generator.all())
         if peek == '{':
             return self._readObject()
         elif peek == '[':
@@ -77,7 +77,7 @@ def _read(self):
             self._readComment()
             return self._read()
         else:
-            raise ReadException, "Input is not valid JSON: '%s'" % self._generator.all()
+            raise ReadException("Input is not valid JSON: '%s'" % self._generator.all())
 
     def _readTrue(self):
         self._assertNext('t', "true")
@@ -103,7 +103,7 @@ def _readNull(self):
 
     def _assertNext(self, ch, target):
         if self._next() != ch:
-            raise ReadException, "Trying to read %s: '%s'" % (target, self._generator.all())
+            raise ReadException("Trying to read %s: '%s'" % (target, self._generator.all()))
 
     def _readNumber(self):
         isfloat = False
@@ -119,7 +119,7 @@ def _readNumber(self):
             else:
                 return int(result)
         except ValueError:
-            raise ReadException, "Not a valid JSON number: '%s'" % result
+            raise ReadException("Not a valid JSON number: '%s'" % result)
 
     def _readString(self):
         result = ""
@@ -132,20 +132,20 @@ def _readString(self):
                     if ch in 'brnft':
                         ch = self.escapes[ch]
                     elif ch == "u":
-		        ch4096 = self._next()
-			ch256  = self._next()
-			ch16   = self._next()
-			ch1    = self._next()
-			n = 4096 * self._hexDigitToInt(ch4096)
-			n += 256 * self._hexDigitToInt(ch256)
-			n += 16  * self._hexDigitToInt(ch16)
-			n += self._hexDigitToInt(ch1)
-			ch = unichr(n)
+                        ch4096 = self._next()
+                        ch256  = self._next()
+                        ch16   = self._next()
+                        ch1    = self._next()
+                        n = 4096 * self._hexDigitToInt(ch4096)
+                        n += 256 * self._hexDigitToInt(ch256)
+                        n += 16  * self._hexDigitToInt(ch16)
+                        n += self._hexDigitToInt(ch1)
+                        ch = chr(n)
                     elif ch not in '"/\\':
-                        raise ReadException, "Not a valid escaped JSON character: '%s' in %s" % (ch, self._generator.all())
+                        raise ReadException("Not a valid escaped JSON character: '%s' in %s" % (ch, self._generator.all()))
                 result = result + ch
         except StopIteration:
-            raise ReadException, "Not a valid JSON string: '%s'" % self._generator.all()
+            raise ReadException("Not a valid JSON string: '%s'" % self._generator.all())
         assert self._next() == '"'
         return result
 
@@ -155,8 +155,8 @@ def _hexDigitToInt(self, ch):
         except KeyError:
             try:
                 result = int(ch)
-	    except ValueError:
-	         raise ReadException, "The character %s is not a hex digit." % ch
+            except ValueError:
+                raise ReadException("The character %s is not a hex digit." % ch)
         return result
 
     def _readComment(self):
@@ -167,7 +167,7 @@ def _readComment(self):
         elif second == '*':
             self._readCStyleComment()
         else:
-            raise ReadException, "Not a valid JSON comment: %s" % self._generator.all()
+            raise ReadException("Not a valid JSON comment: %s" % self._generator.all())
 
     def _readCStyleComment(self):
         try:
@@ -176,10 +176,10 @@ def _readCStyleComment(self):
                 ch = self._next()
                 done = (ch == "*" and self._peek() == "/")
                 if not done and ch == "/" and self._peek() == "*":
-                    raise ReadException, "Not a valid JSON comment: %s, '/*' cannot be embedded in the comment." % self._generator.all()
+                    raise ReadException ("Not a valid JSON comment: %s, '/*' cannot be embedded in the comment." % self._generator.all())
             self._next()
         except StopIteration:
-            raise ReadException, "Not a valid JSON comment: %s, expected */" % self._generator.all()
+            raise ReadException ("Not a valid JSON comment: %s, expected */" % self._generator.all())
 
     def _readDoubleSolidusComment(self):
         try:
@@ -201,7 +201,7 @@ def _readArray(self):
             if not done:
                 ch = self._next()
                 if ch != ",":
-                    raise ReadException, "Not a valid JSON array: '%s' due to: '%s'" % (self._generator.all(), ch)
+                    raise ReadException("Not a valid JSON array: '%s' due to: '%s'" % (self._generator.all(), ch))
         assert ']' == self._next()
         return result
 
@@ -211,12 +211,12 @@ def _readObject(self):
         done = self._peek() == '}'
         while not done:
             key = self._read()
-            if type(key) is not types.StringType:
-                raise ReadException, "Not a valid JSON object key (should be a string): %s" % key
+            if type(key) is not bytes:
+                raise ReadException("Not a valid JSON object key (should be a string): %s" % key)
             self._eatWhitespace()
             ch = self._next()
             if ch != ":":
-                raise ReadException, "Not a valid JSON object: '%s' due to: '%s'" % (self._generator.all(), ch)
+                raise ReadException("Not a valid JSON object: '%s' due to: '%s'" % (self._generator.all(), ch))
             self._eatWhitespace()
             val = self._read()
             result[key] = val
@@ -225,8 +225,8 @@ def _readObject(self):
             if not done:
                 ch = self._next()
                 if ch != ",":
-                    raise ReadException, "Not a valid JSON array: '%s' due to: '%s'" % (self._generator.all(), ch)
-	assert self._next() == "}"
+                    raise ReadException("Not a valid JSON array: '%s' due to: '%s'" % (self._generator.all(), ch))
+        assert self._next() == "}"
         return result
 
     def _eatWhitespace(self):
@@ -242,7 +242,7 @@ def _peek(self):
         return self._generator.peek()
 
     def _next(self):
-        return self._generator.next()
+        return next(self._generator)
 
 class JsonWriter(object):
 
@@ -257,18 +257,18 @@ def write(self, obj, escaped_forward_slash=False):
 
     def _write(self, obj):
         ty = type(obj)
-        if ty is types.DictType:
+        if ty is dict:
             n = len(obj)
             self._append("{")
-            for k, v in obj.items():
+            for k, v in list(obj.items()):
                 self._write(k)
                 self._append(":")
                 self._write(v)
                 n = n - 1
                 if n > 0:
                     self._append(",")
             self._append("}")
-        elif ty is types.ListType or ty is types.TupleType:
+        elif ty is list or ty is tuple:
             n = len(obj)
             self._append("[")
             for item in obj:
@@ -277,31 +277,29 @@ def _write(self, obj):
                 if n > 0:
                     self._append(",")
             self._append("]")
-        elif ty is types.StringType or ty is types.UnicodeType:
+        elif ty is bytes or ty is str:
             self._append('"')
-	    obj = obj.replace('\\', r'\\')
+            obj = obj.replace('\\', r'\\')
             if self._escaped_forward_slash:
                 obj = obj.replace('/', r'\/')
-	    obj = obj.replace('"', r'\"')
-	    obj = obj.replace('\b', r'\b')
-	    obj = obj.replace('\f', r'\f')
-	    obj = obj.replace('\n', r'\n')
-	    obj = obj.replace('\r', r'\r')
-	    obj = obj.replace('\t', r'\t')
+            obj = obj.replace('"', r'\"')
+            obj = obj.replace('\b', r'\b')
+            obj = obj.replace('\f', r'\f')
+            obj = obj.replace('\n', r'\n')
+            obj = obj.replace('\r', r'\r')
+            obj = obj.replace('\t', r'\t')
             self._append(obj)
             self._append('"')
-        elif ty is types.IntType or ty is types.LongType:
+        elif ty is int or ty is float:
             self._append(str(obj))
-        elif ty is types.FloatType:
-            self._append("%f" % obj)
         elif obj is True:
             self._append("true")
         elif obj is False:
             self._append("false")
         elif obj is None:
             self._append("null")
         else:
-            raise WriteException, "Cannot write in JSON: %s" % repr(obj)
+            raise WriteException("Cannot write in JSON: %s" % repr(obj))
 
 def write(obj, escaped_forward_slash=False):
     return JsonWriter().write(obj, escaped_forward_slash)

mmm_modules/notebook_reader.py

@@ -42,7 +42,7 @@ def __init__ (self, path, lang_details=None):
     def sync (self):
         """ must be called after language changes """
         self.lesson_array = []
-        lessons = filter(lambda x: os.path.isdir(os.path.join(self.path, x)), os.listdir(self.path))
+        lessons = [x for x in os.listdir(self.path) if os.path.isdir(os.path.join(self.path, x))]
         lessons.sort()
         for lesson in lessons:
             if lesson[0].isdigit():
@@ -58,9 +58,8 @@ def _get_lesson_filename (self, path):
             code, encoding = locale.getdefaultlocale()
         if code is None:
             code = 'en'
-        files = map(lambda x: os.path.join(path, '%s.abw' % x),
-                    ('_'+code.lower(), '_'+code.split('_')[0].lower(), 'default'))
-        files = filter(lambda x: os.path.exists(x), files)
+        files = [os.path.join(path, '%s.abw' % x) for x in ('_'+code.lower(), '_'+code.split('_')[0].lower(), 'default')]
+        files = [x for x in files if os.path.exists(x)]
         return os.path.join(os.getcwd(), files[0])
 
     def get_lessons (self):