diff options
author | Simon Schampijer <simon@schampijer.de> | 2009-08-06 16:31:00 (GMT) |
---|---|---|
committer | Simon Schampijer <simon@schampijer.de> | 2009-08-06 16:31:00 (GMT) |
commit | 041f65ae6dcdc22d235c0ef7fe05b53334a4d1ff (patch) | |
tree | 1a73e0c0c697e36d0420f309718bd6c6615f0460 /mainscreen.py | |
parent | 535b9dd9c33b0f6daf76042bf183aa94d8afc053 (diff) |
Adopt to json changes in python-2.6 #711
Diffstat (limited to 'mainscreen.py')
-rw-r--r-- | mainscreen.py | 4 |
1 files changed, 2 insertions, 2 deletions
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() |