diff options
| author | Daniel Napora <napcok@gmail.com> | 2015-12-10 13:08:17 +0100 |
|---|---|---|
| committer | Daniel Napora <napcok@gmail.com> | 2015-12-10 13:08:17 +0100 |
| commit | ac84f96ebfcf023cf1e39a1f25b40ab8f268aeef (patch) | |
| tree | 22536ab8a48d26e614325b895d6d573ddf8930cc /usr | |
| parent | 154c5fc3841099dba8ed02d275f8890906d3cbfa (diff) | |
| download | mageiawelcome-ac84f96ebfcf023cf1e39a1f25b40ab8f268aeef.tar mageiawelcome-ac84f96ebfcf023cf1e39a1f25b40ab8f268aeef.tar.gz mageiawelcome-ac84f96ebfcf023cf1e39a1f25b40ab8f268aeef.tar.bz2 mageiawelcome-ac84f96ebfcf023cf1e39a1f25b40ab8f268aeef.tar.xz mageiawelcome-ac84f96ebfcf023cf1e39a1f25b40ab8f268aeef.zip | |
do not use simplejson
Diffstat (limited to 'usr')
| -rw-r--r-- | usr/share/mageiawelcome/mageiawelcome.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/usr/share/mageiawelcome/mageiawelcome.py b/usr/share/mageiawelcome/mageiawelcome.py index 19b3157..8e8a007 100644 --- a/usr/share/mageiawelcome/mageiawelcome.py +++ b/usr/share/mageiawelcome/mageiawelcome.py @@ -8,6 +8,7 @@ import commands import subprocess import shlex import gettext +import json import string import gi gi.require_version('Gtk', '3.0') @@ -15,9 +16,6 @@ from gi.repository import Gtk from user import home -from simplejson import dumps as to_json -from simplejson import loads as from_json - from webgui import start_gtk_thread from webgui import launch_browser from webgui import synchronous_gtk_message @@ -175,7 +173,7 @@ def main(): again = False msg = web_recv() if msg: - msg = from_json(msg) + msg = json.loads(msg) again = True if msg == "close": my_quit_wrapper() |