codex-storage
/
deluge
mirror of https://github.com/codex-storage/deluge.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use the included json library when running on python 2.6

This commit is contained in:
Damien Churchill 2008-10-21 16:19:11 +00:00
parent fbe62805c3
commit 723715ec98
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
deluge/ui/webui/json_api.py
View File

@ -48,14 +48,18 @@ from web import cookies, setcookie as w_setcookie
import utils import utils
from render import render from render import render
from utils import dict_cb from utils import dict_cb
from lib import json
try:
from json import dumps, loads
except ImportError:
from lib.json import write as dumps, read as loads
from deluge.ui.client import sclient,aclient from deluge.ui.client import sclient,aclient
from deluge.log import LOG as log from deluge.log import LOG as log
from deluge import component from deluge import component
def json_response(result, id): def json_response(result, id):
print json.write({ print dumps({
"version":"1.1", "version":"1.1",
"result":result, "result":result,
"id":id "id":id
@ -63,7 +67,7 @@ def json_response(result, id):
def json_error(message , id=-1, msg_number=123): def json_error(message , id=-1, msg_number=123):
log.error("JSON-error:%s" % message) log.error("JSON-error:%s" % message)
print json.write({ print dumps({
"version":"1.1", "version":"1.1",
"id":id, "id":id,
"error":{ "error":{
@ -99,7 +103,7 @@ class json_rpc:
try: try:
log.debug("json-data:") log.debug("json-data:")
log.debug(webapi.data()) log.debug(webapi.data())
json_data = json.read(webapi.data()) json_data = loads(webapi.data())
id = json_data["id"] id = json_data["id"]
method = json_data["method"].replace(".", "_") method = json_data["method"].replace(".", "_")
params = json_data["params"] params = json_data["params"]