Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/terminal.py
diff options
context:
space:
mode:
authorDaniel Narvaez <dwnarvaez@gmail.com>2013-05-18 22:44:17 (GMT)
committer Daniel Francis <francis@sugarlabs.org>2013-05-18 23:35:08 (GMT)
commit74097db3becc980b68b29b2c51a740934e85adc5 (patch)
tree6a62dd6b8f077aa9ae98581fa1aec5303335d16d /terminal.py
parent6879f4c7c9ff1b73f4d0ffa1f8936f89a51e5b36 (diff)
Use json instead of simplejson
Signed-off-by: Daniel Narvaez <dwnarvaez@gmail.com> Acked-by: Daniel Francis <francis@sugarlabs.org> The core and most activities have moved already. This feature isn't used at the moment due the regression with saving in Journal. It's applied because it breaks the buildbot.
Diffstat (limited to 'terminal.py')
-rw-r--r--terminal.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/terminal.py b/terminal.py
index 6a3cfef..521f9be 100644
--- a/terminal.py
+++ b/terminal.py
@@ -18,7 +18,7 @@
import os
import sys
-import simplejson
+import json
import ConfigParser
import logging
from gettext import gettext as _
@@ -389,7 +389,7 @@ class TerminalActivity(activity.Activity):
fd = open(file_path, 'r')
text = fd.read()
- data = simplejson.loads(text)
+ data = json.loads(text)
fd.close()
# Clean out any existing tabs.
@@ -447,7 +447,7 @@ class TerminalActivity(activity.Activity):
# data['tabs'].append(tab_state)
#
# fd = open(file_path, 'w')
-# text = simplejson.dumps(data)
+# text = json.dumps(data)
# fd.write(text)
# fd.close()