Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGonzalo Odiard <godiard@gmail.com>2014-08-02 04:10:36 (GMT)
committer Gonzalo Odiard <godiard@gmail.com>2014-08-02 04:10:36 (GMT)
commita12ddbf5df887e2df0575a6fc9ec6aa771097661 (patch)
tree86921062248d39dbd09ad75c95d91f2bc0ffeec8
parentc4abfa53582570684cf3262b0ecab69e265999f5 (diff)
Replace simplejson by json
-rwxr-xr-xgame.py2
-rw-r--r--model.py6
2 files changed, 4 insertions, 4 deletions
diff --git a/game.py b/game.py
index 9a89eb5..3c9bbd0 100755
--- a/game.py
+++ b/game.py
@@ -1,7 +1,7 @@
#!/usr/bin/python
import os
import math
-import simplejson as json
+import json
import pygame
from gi.repository import Gtk
diff --git a/model.py b/model.py
index e2f5add..2a1b16b 100644
--- a/model.py
+++ b/model.py
@@ -1,6 +1,6 @@
import os
import logging
-import simplejson
+import json
from sugar3.activity import activity
import zipfile
@@ -77,7 +77,7 @@ class GameModel:
data_file_name = 'data.json'
f = open(os.path.join(instance_path, data_file_name), 'w')
try:
- simplejson.dump(self.data, f)
+ json.dump(self.data, f)
finally:
f.close()
@@ -127,7 +127,7 @@ class GameModel:
f = open(os.path.join(instance_path, data_file_name), 'r')
try:
- self.data = simplejson.load(f)
+ self.data = json.load(f)
if not 'resources' in self.data:
self.data['resources'] = []