From 041f65ae6dcdc22d235c0ef7fe05b53334a4d1ff Mon Sep 17 00:00:00 2001
From: Simon Schampijer <simon@schampijer.de>
Date: Thu, 06 Aug 2009 16:31:00 +0000
Subject: Adopt to json changes in python-2.6 #711

---
(limited to 'mainscreen.py')

diff --git a/mainscreen.py b/mainscreen.py
index 56c105e..8af4f93 100644
--- a/mainscreen.py
+++ b/mainscreen.py
@@ -15,7 +15,7 @@
 # along with Typing Turtle.  If not, see <http://www.gnu.org/licenses/>.
 
 # Import standard Python modules.
-import logging, os, math, time, copy, simplejson, locale, datetime, random, re, glob
+import logging, os, math, time, copy, cjson, locale, datetime, random, re, glob
 from gettext import gettext as _
 
 # Import PyGTK.
@@ -126,7 +126,7 @@ class MainScreen(gtk.VBox):
         for f in glob.iglob(path + '/*.lesson'):
             fd = open(f, 'r')
             try:
-                lesson = simplejson.loads(fd.read())
+                lesson = cjson.decode(fd.read())
                 self.lessons.append(lesson)
             finally:
                 fd.close()
--
cgit v0.9.1